From 526830773adf00feb15afd91434b50c69034b162 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 31 Mar 2023 11:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/AppHome.vue        |  4 +--
 .../fengdu/AppNewFarmerBank/integralApply.vue | 25 +++++++++++++++++--
 .../fengdu/AppNewFarmerBank/integralRank.vue  | 12 ++++-----
 .../fengdu/AppNewFarmerBank/taskDetail.vue    | 15 +++++++++--
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index 14d5e73..1519d8d 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -21,8 +21,8 @@
       </div>
 
       <div class="card">
-        <div class="card-left">
-          <div class="left-word" @click="$linkTo('/mods/AppNewFarmerBank/AppNewFarmerBank')">
+        <div class="card-left" @click="$linkTo('/mods/AppNewFarmerBank/AppNewFarmerBank')">
+          <div class="left-word">
             <p>功德银行</p>
             <div>行好事</div>
             <div>得积分</div>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralApply.vue b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
index b9fac33..bd2cfd4 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralApply.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralApply.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="integralApply">
-
+    <div class="card-list">
+      <div class="card">
+        
+      </div>
+    </div>
+    <AiEmpty :description="`暂无数据`" class="emptyWrap"/>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover">积分申请</div>
+    </div>
   </div>
 </template>
 
@@ -24,6 +32,19 @@ export default {
 
 <style lang="scss" scoped>
 .integralApply {
-  
+  padding-bottom: 120px;
+  box-sizing: border-box;
+
+  ::v-deep .btn-wrapper {
+    background: #FFF;
+  }
+
+  ::v-deep .btn-wrapper .btn {
+    height: 80px;
+    line-height: 80px;
+    border-radius: 40px;
+  }
+
+
 }
 </style>
\ No newline at end of file
diff --git a/src/project/fengdu/AppNewFarmerBank/integralRank.vue b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
index a61ead8..153eccc 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralRank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -8,13 +8,13 @@
         </div>
       </div>
       <div class="rank">
-        <div class="header-content" v-if="userInfo">
+        <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" />
-            <span class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(userInfo.name) }}</span>
-            <span class="item-name">{{ userInfo.name }}</span>
-            <span class="item-point">{{ userInfo.integral }}</span>
+            <image :src="userInfo[0].avatar_url" alt="" class="user-img mar-b4" v-if="userInfo[0].avatar_url" />
+            <span class="user-name-bg mar-b4 mar-r24" v-else>{{ $formatName(userInfo[0].name) }}</span>
+            <span class="item-name">{{ userInfo[0].name }}</span>
+            <span class="item-point">{{ userInfo[0].integral }}</span>
           </div>
         </div>
         <div class="faultage"></div>
@@ -90,7 +90,7 @@ export default {
       this.$instance.post(url).then(res => {
         if (res.code === 0) {
           this.list = res.data.map(e=> ({...e, index: e.index}))
-          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)[0]
+          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)
           this.inx = res.data.findIndex(e=> e.open_id == this.user.openId)
           console.log(this.inx);
           this.pageShow = true
diff --git a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
index 7279516..f091259 100644
--- a/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/taskDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="taskDetail">
+  <div class="taskDetail" v-if="showPages">
     <div class="task">
       <h4>{{ info.title }}</h4>
       <p>{{ info.detail }}</p>
@@ -73,6 +73,7 @@ export default {
       qqmapsdk: null,
       distance: 100,
       flag: false,
+      showPages: false,
     }
   },
   computed: {
@@ -345,7 +346,17 @@ export default {
     uni.setNavigationBarTitle({
       title: '任务详情'
     });
-    this.getDetail()
+    if (!this.user.idNumber) {
+      this.$dialog.confirm({
+        content: '您只有完成信息认证后，才可进行相关操作。',
+        confirmText: '去认证'
+      }).then(() => {
+        this.$linkTo('/pages/AppMine/userInfo')
+      }).catch(() => {
+      })
+    } else {
+      this.getDetail()
+    }
     this.qqmapsdk = new QQMapWX({
       key: process.env.NODE_ENV == 'production' ? 'RWWBZ-64BEJ-MVLFJ-FTHLQ-JTR6J-SAB2S' : '3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY'
     })