From a88092021b14abc67c2f2e53ce722d609632aeb5 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 23 八月 2022 08:07:36 +0800
Subject: [PATCH] 修改日计划，我的待办，等相应bug
---
pages/my-application/my-application.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index 0a83ac1..2efb3c6 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -48,7 +48,7 @@
<!-- 鎴戠殑鐢宠鍗＄墖鍖哄煙 -->
<!-- <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:150px"> -->
<combination-card v-for="(item, index) in shenqingData" index="index">
- <template v-slot:top>
+ <template v-slot:top>
<!-- <u-checkbox size="35" :key="item.id" :name="item.id"></u-checkbox> -->
<view>
<text>{{ item.title }}</text>
@@ -61,7 +61,7 @@
<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
</view>
<view class="">
- <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+ <text>瀹℃壒鐜妭锛歿{ item.currTaskName == null ? '' : item.currTaskName }}</text>
</view>
</view>
<view class="center-content__two center-margin">
@@ -94,7 +94,7 @@
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
+ <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 )&& (item.procDefId == 'WAY_BILL:4:87504')">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
@@ -139,7 +139,9 @@
</view>
<!--杩斿洖椤堕儴-->
- <u-back-top :scroll-top="scrollTop"></u-back-top>
+ <view class="back-top-container">
+ <u-back-top :scroll-top="scrollTop" style="position:fixed;bottom:100px;right:100px;"></u-back-top>
+ </view>
<view class="" style="height:50px;">
@@ -340,7 +342,7 @@
// this.myApplication.pageNumber++; // 姣忚Е搴曚竴娆� page +1
if (this.myApplication.title || this.myApplication.status || this.myApplication.result || this.myApplication.startTime || this.myApplication.endTime) {
if(this.myApplication.pageNumber == 1){
- this.shenqingData = response.data.records
+ this.shenqingData = response.data.records;
}else{
this.shenqingData = this.shenqingData.concat(response.data.records);
}
@@ -786,6 +788,16 @@
}
}
+ // 杩斿洖椤堕儴
+ .back-top-container{
+ .u-transition{
+ position:fixed;
+ bottom:vww(80)!important;
+ right:vww(20)!important;
+ }
+ }
+
+
// 搴曢儴
.bottomTabbar {
position: fixed;
--
Gitblit v1.9.1