From 2ec0060bbcea59b8d016a9bbd3414893d87e3017 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Mar 2023 10:39:45 +0800
Subject: [PATCH] bug

---
 .../fengdu/AppNewFarmerBank/integralTask.vue    |  8 +++++++-
 .../fengdu/AppNewFarmerBank/taskDetail.vue      | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/integralTask.vue b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
index 3c9f72e..0bb3cd9 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralTask.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
@@ -13,7 +13,7 @@
           <span>{{ item.detail }}</span>
         </p>
         <div class="imgs" v-if="item.files">
-          <image mode="aspectFill" v-for="(e, i) in item.files.substring(0,3)" :key="i" :src="e.url"/>
+          <image mode="aspectFill" v-for="(e, i) in item.files" :key="i" :src="e.url"/>
         </div>
         <div class="time">
           <div class="goin" v-if="item.intoBegintime && item.intoEndtime">
@@ -59,6 +59,12 @@ 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=> {
+            return {
+              ...e,
+              files: e.files.length > 3? e.files?.substring(0,3) : e.files
+            }
+          })
         }
       })
     }
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index 6efabc3..1aae98b 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -52,7 +52,7 @@
     </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="daka">打卡签到</div>
+        <div class="daka">{{ dkqd }}</div>
         <div class="text" v-if="isClock==1">积分+{{ intoIntegral }}</div>
       </div>
       <div class="tips">{{ scope }}</div>
@@ -135,6 +135,21 @@ export default {
       }
 
       return `未到打卡时间/不在指定位置`
+    },
+    dkqd() {
+      const times = new Date().getTime()
+      const inSTimes = new Date(this.info.intoBegintime?.replaceAll('-', '/')).getTime() // 进场开始
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime() // 进场结束
+      const outSTimes = new Date(this.info.exitBegintime?.replaceAll('-', '/')).getTime() // 离场开始
+      const outETimes = new Date(this.info.exitEndtime?.replaceAll('-', '/')).getTime() // 离场结束
+      if (this.info.clockRange > this.distance && (this.info.intoClock && (inSTimes < times && times < inETimes)) || (this.info.exitClock && outSTimes < times && times < outETimes)) {
+        return `已打卡`
+      }
+      if (this.info.clockRange > this.distance && (!this.info.intoClock && (times > inSTimes && times < inETimes)) || !this.info.exitClock && (times > outSTimes && times < outETimes)) {
+        return `打卡签到`
+      }
+
+      return `打卡签到`
     }
   },
   methods: {