From e56b9fbd86d7fcc6c719196a080c424085193fcd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Mar 2023 15:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=A6=BB=E5=9C=BA=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=B7=B2=E6=89=93=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/project/fengdu/AppNewFarmerBank/integralRank.vue b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
index e37fd33..a2ab952 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralRank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="rank">
-        <div class="header-content">
+        <div class="header-content" v-if="userInfo.length">
           <div class="item">
             <span class="item-num">{{ inx + 1 }}</span>
             <image :src="userInfo.avatar_url" alt="" class="user-img mar-b4" v-if="userInfo.avatar_url" />
@@ -44,7 +44,6 @@
               <div class="item" v-for="(item, index) in list" :key="index">
                 <span class="item-num">{{ index + 1 }}</span>
                 <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
-                <!-- <div class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(item.name) }}</div> -->
                 <span class="item-name">{{ item.name }}</span>
                 <span class="item-point">{{ item.integral }}</span>
               </div>
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index b8fd401..46ab129 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -51,7 +51,7 @@
     </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>/积分+{{ intoIntegral }}</span></div>
+        <div class="daka">{{ dkqd }}<span v-if="this.info.exitIntegral && this.info.intoIntegral">/积分+{{ intoIntegral }}</span></div>
       </div>
     </div>
   </div>
@@ -147,6 +147,10 @@ export default {
         return `打卡签到`
       }
 
+      if (times > outSTimes && times < outETimes && !this.info.exitIntegral) {
+        return `已打卡`
+      }
+
       return `打卡签到`
     },
     baoming() {