From 7f78c064f038e0f841cc8174d24282490162999f Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Sun, 16 Apr 2023 14:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/checkList/checkList.vue   | 2 +-
 pages/taskDetail/taskDetail.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/checkList/checkList.vue b/pages/checkList/checkList.vue
index 5ee15b1..889488f 100644
--- a/pages/checkList/checkList.vue
+++ b/pages/checkList/checkList.vue
@@ -111,7 +111,7 @@
 		padding:50upx 70upx;
 	}
 .taskList{
-	min-height: calc(100vh);
+	min-height: calc(100vh - 100upx);
 	background-color: #F7F8FA;
 	.taskItem{
 		background: #FFFFFF;
diff --git a/pages/taskDetail/taskDetail.vue b/pages/taskDetail/taskDetail.vue
index 56de06f..1e2e2d1 100644
--- a/pages/taskDetail/taskDetail.vue
+++ b/pages/taskDetail/taskDetail.vue
@@ -51,7 +51,7 @@
 							<image src="../../static/img.png" v-if="contentInfo.file_suffix=='png'" mode=""></image>
 							<image src="../../static/pdf.png" v-if="contentInfo.file_suffix=='pdf'" mode=""></image>
 							<!-- <text style="overflow: hidden;width:400upx;text-overflow: ellipsis;">{{contentInfo.file}}</text> -->
-							<text style="color:#0076F6;text-decoration: underline;">查看</text>
+							<text style="color:#0076F6;text-decoration: underline;margin-left:10upx;">查看</text>
 						</view>
 					</u-cell>
 					<u-cell size="large" title="拍照" center class="img" :border="false">
@@ -150,7 +150,7 @@
 				num:null,
 				startVisible:false,
 				timer:null,
-				countDownTime:10,
+				countDownTime:4,
 				submitTimer:null,
 				submitTimesNum:0
 			};
@@ -337,7 +337,7 @@
 					}
 					
 					
-					if(this.contentInfo.needing_remake){
+					if(this.contentInfo.needing_remake&&this.info.status!=3){
 						this.startVisible = true;
 						this.timer = setInterval(() => {
 							this.countDownTime --;