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 @@ - 查看 + 查看 @@ -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 --;