From ed1c2a6df29b0809f29dc8d2db4f9002c79a404b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 11 Apr 2023 10:58:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E5=BE=B7=E9=93=B6=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/AppNewFarmerBank/integralRank.vue      | 15 ++++++---------
 .../fengdu/AppNewFarmerBank/integralTask.vue      |  5 +++++
 .../AppRedemptionPoints/AppRedemptionPoints.vue   |  7 ++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/integralRank.vue b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
index 7b5e354..a1121a5 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralRank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -40,13 +40,11 @@
             </div>
           </div>
           <div class="ranking-list" v-if="list && list.length">
-            <div v-if="list.length > 2">
-              <div class="item" v-for="(item, index) in list" :key="index" v-if="index > 2">
-                <span class="item-num">{{ index + 4 }}</span>
-                <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
-                <span class="item-name">{{ item.name }}</span>
-                <span class="item-point">{{ item.integral }}</span>
-              </div>
+            <div class="item" v-for="(item, index) in list" :key="index" v-if="index > 2">
+              <span class="item-num">{{ index + 4 }}</span>
+              <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
+              <span class="item-name">{{ item.name }}</span>
+              <span class="item-point">{{ item.integral }}</span>
             </div>
           </div>
         </div>
@@ -86,13 +84,12 @@ export default {
     },
     getList() {// 积分排行
       this.list = {}
-      var url = `/app/appintegraluser/integralSortFD?type=${this.tabIndex}`  //积分排行
+      var url = `/app/appintegraluser/integralSortFD?type=${this.tabIndex}&areaId=${this.user.areaId}`  //积分排行
       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)
           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/integralTask.vue b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
index 937f943..cd8e8dc 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralTask.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
@@ -39,6 +39,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: 'integralTask',
   appName: '积分任务',
@@ -49,12 +50,16 @@ export default {
       files: [],
     }
   },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
   methods: {
     getList() {
       this.$instance.post('/app/appintegraltask/list',null,{
         params: {
           current: this.current,
           status: 1,
+          areaId: this.user.areaId
         }
       }).then(res=> {
         if(res?.data) {
diff --git a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
index 6aecd57..9dfcd69 100644
--- a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
+++ b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -81,7 +81,7 @@ export default {
         'background': '#2D7DFF'
       },
       typeList: ['最新上架', '积分', '我可兑换的'],
-      currentType: 1,
+      currentType: 0,
       pointTypeList: [{name: '全部'}, {name: '50分以下'},  {name: '100分以下'},  {name: '200分以下'},  {name: '5000分以下'}],
       currentPoint: 0,
       leftList: [1,1,1,1,1,11,1,1],
@@ -196,7 +196,7 @@ export default {
     }
   }
   .list-content {
-    padding: 480px 0 24px 24px;
+    padding: 396px 0 24px 24px;
     background-color: #f3f6f9;
     .item {
       width: calc(100% - 24px);
@@ -229,6 +229,7 @@ export default {
       .content {
         padding: 16px 16px 24px;
         position: relative;
+        background-color: #fff;
         .text {
           font-family: PingFangSC-SNaNpxibold;
           font-weight: 600;
@@ -263,7 +264,7 @@ export default {
             display: inline-block;
             font-family: PingFangSC-Regular;
             font-weight: 400;
-            font-size: 8px;
+            font-size: 20px;
             color: #4181FF;
             line-height: 22px;
           }