From e170fd5e5b5b7fbc9a19d7aff4cf0908adeffe10 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 19 十二月 2022 14:09:12 +0800
Subject: [PATCH] ‘第一次提交’

---
 pages/my-have-todo/my-have-todo.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pages/my-have-todo/my-have-todo.vue b/pages/my-have-todo/my-have-todo.vue
index 3dffd2c..00280e5 100644
--- a/pages/my-have-todo/my-have-todo.vue
+++ b/pages/my-have-todo/my-have-todo.vue
@@ -51,7 +51,7 @@
 							</view>
 							<view class="center-content__two center-margin">
 								<view>
-									<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+									<text>鍙戣捣浜猴細{{ item.actBusiness.createByName || '' }}</text>
 								</view>
 								<view>
 									<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
@@ -59,7 +59,7 @@
 							</view>
 							<view class="center-content__three center-margin">
 								<view class="">
-									<text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+									<text>瀹℃壒鎰忚锛歿{ item.comment == 'undefined' ? '鏈~鍐�' : item.comment || '鏈~鍐�' }}</text>
 								</view>
 								<view class="">
 									<text>
@@ -82,7 +82,7 @@
 						<view class="bottom-container">
 							<!-- 宸插姙鎸夐挳 -->
 							<view class="bottom-content__item">
-								<view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
+								<view @click="theFormDataClick(item.tableId)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
 									<image src="@/static/home/biaodan.png" mode=""></image>
 									<view>鐢宠璇︽儏</view>
 								</view>
@@ -99,6 +99,10 @@
 					</template>
 				</combination-card>
 			</u-checkbox-group>
+		</view>
+		
+		<view class="empty-placeH">
+		
 		</view>
 		<!-- 搴曢儴鍏ㄩ�� -->
 		<view class="bottomTabbar">
@@ -126,9 +130,7 @@
 		<!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
 
 		<!--杩斿洖椤堕儴-->
-    <view class="back-top-container">
-      <u-back-top :scroll-top="scrollTop"></u-back-top>
-    </view>
+		<view class="back-top-container"><u-back-top :scroll-top="scrollTop"></u-back-top></view>
 
 		<!-- 鑿滃崟鏍� -->
 		<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -389,6 +391,8 @@
 
 <style lang="scss" scoped>
 ::v-deep.my-have-todo {
+	width: 100%;
+	height: 100%;
 	// 鎼滅储鍖哄煙
 	.searchContainer {
 		width: 94%;
@@ -594,14 +598,19 @@
 		}
 	}
 
-  // 杩斿洖椤堕儴
-  .back-top-container{
-    .u-transition{
-      position:fixed;
-      bottom:vww(80)!important;
-      right:vww(20)!important;
-    }
-  }
+	// 杩斿洖椤堕儴
+	.back-top-container {
+		.u-transition {
+			position: fixed;
+			bottom: vww(80) !important;
+			right: vww(20) !important;
+		}
+	}
+	
+	// 搴曢儴绔欎綅
+	.empty-placeH{
+		height:vww(5);
+	}
 
 	// 搴曢儴
 	.bottomTabbar {

--
Gitblit v1.9.1