From 66a9c4aa3dba9c53ae4fb92d40cacc03e1569347 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Mar 2023 18:08:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppNewFarmerBank/taskDetail.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index 5462892..78e970a 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -50,7 +50,7 @@
       </div>
     </div>
     <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="btn" @click="clockIn" hover-class="text-hover" :class="isClock== 0? 'gray': isClock==3? 'gray': isClock== 2? 'opacity': isClock == 4? 'opacity':''">
         <div class="daka">{{ dkqd }}<span v-if="(info.intoBegintime && info.exitBegintime && info.exitIntegral) || (info.intoIntegral && info.exitIntegral)">/积分+{{ intoIntegral }}</span></div>
       </div>
     </div>
@@ -116,6 +116,10 @@ export default {
       if(this.distance > this.info.clockRange) {
         return 3
       }
+      // 在打卡范围内，没有积分
+      if (this.info.clockRange > this.distance && (this.info.intoClock && (inSTimes < times && times < inETimes) && this.info.intoIntegral) || (this.info.exitClock && outSTimes < times && times < outETimes) && !this.info.exitIntegral) {
+        return 4
+      }
     },
     scope() {
       const times = new Date().getTime()
@@ -226,7 +230,8 @@ export default {
         })
       }
 
-      if (this.isClock == 2) {
+
+      if (this.isClock == 2 || this.isClock == 4) {
         return this.$u.toast(`已打卡，请勿重复打卡！`)
       }
 

From 5d8ade3a3a4acc98a7f00ee2c4565a72380825cd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 31 Mar 2023 09:10:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=AF=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppNewFarmerBank/signIn.vue     | 2 +-
 src/project/fengdu/AppNewFarmerBank/taskDetail.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/signIn.vue b/src/project/fengdu/AppNewFarmerBank/signIn.vue
index 480085e..5d12495 100644
--- a/src/project/fengdu/AppNewFarmerBank/signIn.vue
+++ b/src/project/fengdu/AppNewFarmerBank/signIn.vue
@@ -7,7 +7,7 @@
 <script>
 export default {
   name: 'signIn',
-  appName: 'signIn',
+  appName: '签到',
   data() {
     return {
 
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index 78e970a..7279516 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -45,13 +45,13 @@
     </div>
     <div class="btn-wrapper" v-if="info.type==1">
       <div class="btn" @click="signUp" hover-class="text-hover" :class="baoming==1? 'opacity': baoming == 0? 'gray':''">
-        <span v-if="baoming==2 || baoming == 0">报名得积分/积分+{{ info.enrollIntegral }}</span>
+        <span v-if="baoming==2 || baoming == 0">报名得积分<span v-if="baoming==2">/积分+{{ info.enrollIntegral }}</span></span>
         <span v-if="baoming==1">已报名</span>
       </div>
     </div>
     <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': isClock == 4? 'opacity':''">
-        <div class="daka">{{ dkqd }}<span v-if="(info.intoBegintime && info.exitBegintime && info.exitIntegral) || (info.intoIntegral && info.exitIntegral)">/积分+{{ intoIntegral }}</span></div>
+        <div class="daka">{{ dkqd }}<span v-if="isClock==1">/积分+{{ intoIntegral }}</span></div>
       </div>
     </div>
   </div>