Merge remote-tracking branch 'origin/dev' into dev

src/project/fengdu/AppNewFarmerBank/signIn.vue

@@ -7,7 +7,7 @@
 <script>
 export default {
   name: 'signIn',
-  appName: 'signIn',
+  appName: '签到',
   data() {
     return {
 

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':''">
-        <div class="daka">{{ dkqd }}<span v-if="(info.intoBegintime && info.exitBegintime && info.exitIntegral) || (info.intoIntegral && info.exitIntegral)">/积分+{{ intoIntegral }}</span></div>
+      <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="isClock==1">/积分+{{ intoIntegral }}</span></div>
       </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(`已打卡，请勿重复打卡！`)
       }