From 5481602d07e5668aa5505f43003a3b24cd85686c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Mar 2023 14:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=97=B6=E9=97=B4css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/AppNewFarmerBank/integralTask.vue        | 13 ++++++++-----
 src/project/fengdu/AppNewFarmerBank/taskDetail.vue  |  9 ++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/integralTask.vue b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
index 58a6439..937f943 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralTask.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
@@ -18,10 +18,10 @@
         <div class="time">
           <div class="goin" v-if="item.intoBegintime && item.intoEndtime">
             <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
-            <div class="label">进场时间：</div>
+            <div class="label">{{ item.type == 0 ? '进场时间：' : '报名时间：' }}</div>
             <div class="value">{{ item.intoBegintime.substring(0, 16)}} 至 {{ item.intoEndtime.substring(0, 16) }}</div>
           </div>
-          <div class="exit" v-if="item.exitBegintime && item.exitEndtime">
+          <div class="exit" v-if="item.exitBegintime && item.exitEndtime && item.type == 0">
             <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
             <div class="label">离场时间：</div>
             <div class="value">{{ item.exitBegintime.substring(0, 16) }} 至 {{ item.exitEndtime.substring(0, 16) }}</div>
@@ -58,13 +58,16 @@ export default {
         }
       }).then(res=> {
         if(res?.data) {
-          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          this.list = this.list.map(e=> {
+          const arr = res.data.records.map(e => {
             return {
               ...e,
-              files: e.files.length > 3? e.files?.substring(0,3) : e.files
+              files: e.files.length > 3 ? e.files.slice(0, 3) : e.files
             }
           })
+          this.$nextTick(()=> {
+            this.list = this.current > 1 ? [...this.list, ...arr] : arr
+          })
+          
         }
       })
     }
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index ca92da9..ed5bae3 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -31,11 +31,11 @@
       <div class="item">
         <img src="https://cdn.cunwuyun.cn/fengdu/ic-jinchangshijian.png" alt="">
         <div class="item-info" v-if="info.intoBegintime && info.intoEndtime">
-          <label>进场时间：</label>
+          <label>{{ info.type == 0 ? '进场时间：' : '报名时间：' }}</label>
           <div class="value">{{ info.intoBegintime.substring(0, 16) }} 至 {{ info.intoEndtime.substring(0, 16) }}</div>
         </div>
       </div>
-      <div class="item">
+      <div class="item" v-if="info.type == 0">
         <img src="https://cdn.cunwuyun.cn/fengdu/ic-lichangshijian.png" alt="">
         <div class="item-info" v-if="info.exitBegintime && info.exitEndtime">
           <label>离场时间：</label>
@@ -49,12 +49,11 @@
         <span v-if="baoming==1">已报名</span>
       </div>
     </div>
-    <div class="btn-clock" v-if="info.type == 0">
-      <div class="btn-circle" @click="clockIn" hover-class="text-hover" :class="isClock== 0? 'gray': isClock==3? 'gray': isClock== 2? 'opacity':''">
+    <div class="btn-wrapper" v-if="info.type == 0">
+      <div class="btn" @click="clockIn" hover-class="text-hover" :class="isClock== 0? 'gray': isClock==3? 'gray': isClock== 2? 'opacity':''">
         <div class="daka">{{ dkqd }}</div>
         <div class="text" v-if="isClock==1">积分+{{ intoIntegral }}</div>
       </div>
-      <div class="tips">{{ scope }}</div>
     </div>
   </div>
 </template>