165

src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue

@@ -6,7 +6,7 @@
     <div class="welcome">
       <div class="welcome-user">
         <span class="name">{{ user.realName || user.nickName }}</span>，
-        <span v-if="!user.idNumber">欢迎来到丰收银行！</span>
+        <span v-if="!user.idNumber">欢迎来功德银行！</span>
         <span v-else>欢迎进入{{ user.areaName }}！</span>
         
       </div>
@@ -21,7 +21,7 @@
         <p>积分任务</p>
         <h4>完成任务得积分</h4>
       </div>
-      <div class="jfph" @click="$linkTo('./integralRank')">
+      <div class="jfph" @click="toPages('./integralRank')">
         <p>积分排行</p>
         <h4>社区荣誉榜</h4>
       </div>

src/project/fengdu/AppNewFarmerBank/integralTask.vue

@@ -54,7 +54,7 @@ export default {
       this.$instance.post('/app/appintegraltask/list',null,{
         params: {
           current: this.current,
-          status: 1
+          status: 1,
         }
       }).then(res=> {
         if(res?.data) {

src/project/fengdu/AppNewFarmerBank/taskDetail.vue

@@ -44,10 +44,9 @@
       </div>
     </div>
     <div class="btn-wrapper" v-if="info.type==1">
-      <!-- , -->
-      <div class="btn" @click="signUp" hover-class="text-hover">
-        <span>报名得积分/积分+{{ info.enrollIntegral }}</span>
-        <!-- <span>已报名</span> -->
+      <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==1">已报名</span>
       </div>
     </div>
     <div class="btn-clock" v-if="info.type == 0">
@@ -150,6 +149,19 @@ export default {
       }
 
       return `打卡签到`
+    },
+    baoming() {
+      const times = new Date().getTime()
+      const inETimes = new Date(this.info.intoEndtime?.replaceAll('-', '/')).getTime() // 进场结束
+      // 0不符合条件 1已报名 2可以报名
+      if (this.info.enrollClock) {
+        return 1
+      }
+      if (!this.info.enrollClock && times < inETimes) {
+        return 2
+      }
+
+      return 0
     }
   },
   methods: {
@@ -259,7 +271,6 @@ export default {
               this.qqmapsdk.reverseGeocoder({
                 location: `${res.latitude},${res.longitude}`,
                 success: data => {
-                  console.log(data);
                   this.address = data.result.formatted_addresses.recommend
                 },
                 fail: function (info) {
@@ -434,9 +445,6 @@ export default {
     height: 372px;
     width: 100%;
     background: #FFF;
-    position: fixed;
-    left: 0;
-    bottom: 0;
     .btn-circle {
       width: 226px;
       height: 226px;