From 8bf723cc55ee4a80f596d9b45ac60aef71660b34 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 29 Mar 2023 18:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppHome/AppHome.vue        |  2 +-
 .../AppNewFarmerBank/AppNewFarmerBank.vue     |  8 +++-
 .../fengdu/AppNewFarmerBank/integralRank.vue  |  2 +-
 .../fengdu/AppNewFarmerBank/integralTask.vue  | 45 ++++++++++++-------
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index ba8c5c4..14d5e73 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -191,7 +191,7 @@ export default {
   height: 100vh;
 
   .container{
-    background: url('https://cdn.cunwuyun.cn/fengdu/mdpi_img-bg2.png') no-repeat;
+    background: url('https://cdn.cunwuyun.cn/fengdu/img-bg2.png') no-repeat;
     background-size: 100% auto;
     .swiper-content {
       width: 100%;
diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index 0f79f6d..4ed3b96 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -14,7 +14,7 @@
         <p>积分申请</p>
         <h4>好事自荐得积分</h4>
       </div>
-      <div class="jsrw" @click="toPages('/mods/AppNewFarmerBank/concentrationTask')">
+      <div class="jsrw" @click="toPages('./integralTask')">
         <p>积分任务</p>
         <h4>完成任务得积分</h4>
       </div>
@@ -93,10 +93,14 @@ export default {
   
   .swiper-content {
     width: 100%;
-    height: 300px;
+    height: 332px;
+    padding: 32px 32px 0;
+    box-sizing: border-box;
+    background: #FFF;
     img {
       width: 100%;
       height: 100%;
+      border-radius: 16px;
     }
   }
 
diff --git a/src/project/fengdu/AppNewFarmerBank/integralRank.vue b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
index b0b66f9..b57c27c 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralRank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -10,7 +10,7 @@
       <div class="rank">
         <div class="header-content">
           <div class="item">
-            <span class="item-num">{{ inx }}</span>
+            <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>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralTask.vue b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
index ab16b0e..5fb1bf8 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralTask.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="integralTask">
-    <div class="img-bg">
-      <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
+    <div class="fix-top">
+      <div class="img-bg">
+        <img src="https://cdn.cunwuyun.cn/fengdu/img-jifenlist.png" alt="">
+      </div>
+      <div class="title">任务大厅</div>
     </div>
-    <div class="title">任务大厅</div>
     <div class="card-list" v-if="list.length">
       <div class="card" v-for="(item,index) in list" :key="index" @click="$linkTo('./taskDetail?id='+item.id)">
         <h4>{{ item.title }}</h4>
@@ -53,7 +55,7 @@ export default {
         }
       }).then(res=> {
         if(res?.data) {
-          this.list = res.data.records
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
       })
     }
@@ -67,7 +69,7 @@ export default {
     })
   },
   onReachBottom() {
-    this.current++;
+    this.current++
     this.getList()
   },
 }
@@ -75,21 +77,32 @@ export default {
 
 <style lang="scss" scoped>
 .integralTask {
-  .img-bg {
+  padding-top: 292px;
+  .fix-top {
     width: 100%;
-    height: 216px;
-    img {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    .img-bg {
       width: 100%;
-      height: 100%;
+      height: 216px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .title {
+      font-size: 34px;
+      font-weight: 500;
+      color: #222222;
+      padding: 32px 32px 0;
+      background: #f3f5f7;
+      z-index: 999;
+      opacity: 1;
     }
   }
-  .title {
-    font-size: 34px;
-    font-weight: 500;
-    color: #222222;
-    padding: 0 32px;
-    margin-top: 32px;
-  }
+  
   .card-list {
     padding: 24px 32px;
     box-sizing: border-box;