From 16a4337d88052cc16a2ce28ef85c4d5baa301b83 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 29 Mar 2023 16:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNewFarmerBank/AppNewFarmerBank.vue     |   2 +-
 .../components/familyRank.vue                 | 393 +++++++++++++++++
 .../AppNewFarmerBank/components/userRank.vue  | 397 ++++++++++++++++++
 .../fengdu/AppNewFarmerBank/integralRank.vue  | 383 +++++++++++++++++
 .../fengdu/AppNewFarmerBank/integralTask.vue  |  14 +-
 5 files changed, 1186 insertions(+), 3 deletions(-)
 create mode 100644 src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
 create mode 100644 src/project/fengdu/AppNewFarmerBank/components/userRank.vue
 create mode 100644 src/project/fengdu/AppNewFarmerBank/integralRank.vue

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index 31b0633..6d1bf6b 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -18,7 +18,7 @@
         <p>积分任务</p>
         <h4>完成任务得积分</h4>
       </div>
-      <div class="jfph" @click="$u.toast('内容建设中...')">
+      <div class="jfph" @click="$linkTo('./integralRank')">
         <p>积分排行</p>
         <h4>社区荣誉榜</h4>
       </div>
diff --git a/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue b/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
new file mode 100644
index 0000000..038db58
--- /dev/null
+++ b/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
@@ -0,0 +1,393 @@
+<template>
+  <div class="pages">
+    <div class="bg-blue"></div>
+    <div class="header-content">
+      <div class="item">
+        <div class="num color-5AAD6A">{{ info['家庭积分'] || '0' }}</div>
+        <div class="label">家庭总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-4185F5">{{ info['剩余总分'] || '0' }}</div>
+        <div class="label">剩余总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-CD413A">{{ info['家庭排行'] || '0' }}</div>
+        <div class="label">家庭排名</div>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+    </div>
+    <div v-if="!showDetail">
+      <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
+        <div class="item" v-if="info['列表'].length > 1">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+          <img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
+          <p class="item-num">{{ info['列表'][1].integral }}</p>
+        </div>
+        <div class="item-top item" v-if="info['列表'].length > 0">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+          <img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
+          <p class="item-num">{{ info['列表'][0].integral }}</p>
+        </div>
+        <div class="item" v-if="info['列表'].length > 2">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+          <img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
+          <p class="item-num">{{ info['列表'][2].integral }}</p>
+        </div>
+      </div>
+      <div class="ranking-list" v-if="info['列表'] &&  info['列表'].length">
+        <div class="item" v-for="(item, index) in info['列表']" :key="index" v-if="index > 2">
+          <span class="item-num">{{ index + 1 }}</span>
+          <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+          <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>
+      </div>
+    </div>
+    <div class="detail-content" v-if="showDetail && list.length">
+      <div class="title">积分明细</div>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
+          <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+        </div>
+        <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+          {{ (item.integralCalcType == 1 ? '+':'-') + item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "familyRank",
+  appName: "家庭积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  props: {
+    showDetail: {  //true 积分明细 false积分排行
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      info: {},
+      current: 1,
+      list: [],
+    }
+  },
+  mounted() {
+    this.getInfo()
+    if(this.showDetail) {
+      this.getList()
+    }
+  },
+  methods: {
+    getInfo() {// 积分排行
+      this.info = {}
+      var url = `/app/appresident/rank?id=${this.user.residentId}&type=0&areaId=${this.user?.areaId}`  //积分排行
+      this.$instance.post(url).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+    getList() {// 积分明细列表
+      // var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10`  //积分明细
+      let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&queryType=0&current=${this.current}&size=10`  //积分明细
+      this.$instance.post(url).then(res => {
+        if (res?.data) {
+          if (this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="scss">
+
+.pages {
+  width: 100vw;
+  overflow-x: hidden;
+  height: calc(100% - 136px);
+  background-color: #f3f6f9;
+
+    .bg-blue {
+      width: 100%;
+      height: 176px;
+      background-color: #4181FF;
+    }
+
+    .header-content {
+      width: 690px;
+      height: 256px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: -130px 0 40px 30px;
+      padding: 100px 60px 40px 60px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      position: relative;
+
+      .item {
+        text-align: center;
+        z-index: 99;
+
+        .num {
+          font-family: DIN;
+          font-size: 52px;
+          font-weight: bold;
+          line-height: 60px;
+        }
+
+        .label {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 40px;
+          margin-top: 10px;
+        }
+
+        .color-5AAD6A {
+          color: #5AAD6A;
+        }
+
+        .color-4185F5 {
+          color: #4185F5;
+        }
+
+        .color-CD413A {
+          color: #CD413A;
+        }
+      }
+
+      img {
+        position: absolute;
+        width: 360px;
+        height: 250px;
+        top: -40px;
+        right: 0;
+      }
+    }
+
+    .ranking-content {
+      padding: 94px 30px 0;
+      background-color: #fff;
+
+      .item {
+        display: inline-block;
+        width: 216px;
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12px;
+        padding: 40px 0 76px 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+
+        .user-name {
+          font-size: 30px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42px;
+        }
+
+        .item-num {
+          font-size: 46px;
+          font-weight: 6000;
+          color: #2C51CE;
+          line-height: 54px;
+        }
+
+        .top-img {
+          width: 100%;
+          height: 34px;
+          position: absolute;
+          top: -11px;
+          left: 0;
+        }
+      }
+
+      .item-top {
+        margin: -46px 20px 0;
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+        }
+
+        .user-name-bg {
+          width: 104px;
+          height: 104px;
+          border-radius: 50%;
+          background-color: #4E8EEE;
+          font-size: 28px;
+          line-height: 104px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22px;
+          left: 0;
+          height: 46px;
+        }
+      }
+    }
+
+    .ranking-list {
+      background-color: #fff;
+
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          color: #858594;
+          font-size: 28px;
+        }
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: 210px;
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+    .user-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+
+    .user-name-bg {
+      display: inline-block;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background-color: #4E8EEE;
+      font-size: 28px;
+      line-height: 80px;
+      text-align: center;
+      color: #fff;
+    }
+
+    .mar-b4 {
+      margin-bottom: 8px;
+    }
+
+    .mar-b8 {
+      margin-bottom: 16px;
+    }
+
+    .detail-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: 0 0 0 32px;
+      padding: 30px 30px 94px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 30px;
+      }
+
+      .item {
+        padding: 34px 0 32px 0;
+        border-bottom: 2px solid #ddd;
+        display: flex;
+
+        .item-info {
+          width: 500px;
+
+          p {
+            word-break: break-all;
+            font-size: 32px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+
+          span {
+            display: inline-block;
+            margin-top: 8px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34px;
+          }
+        }
+
+        .item-num {
+          width: calc(100% - 500px);
+          text-align: right;
+          font-size: 36px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50px;
+        }
+      }
+    }
+
+    .color-0 {
+      color: #2C51CE !important;
+    }
+
+    .color-1 {
+      color: #E6736E !important;
+    }
+
+    .fixed-top {
+      z-index: 999;
+    }
+}
+</style>
diff --git a/src/project/fengdu/AppNewFarmerBank/components/userRank.vue b/src/project/fengdu/AppNewFarmerBank/components/userRank.vue
new file mode 100644
index 0000000..a560153
--- /dev/null
+++ b/src/project/fengdu/AppNewFarmerBank/components/userRank.vue
@@ -0,0 +1,397 @@
+<template>
+  <div class="pages">
+    <div class="bg-blue"></div>
+    <div class="header-content">
+      <div class="item">
+        <div class="num color-5AAD6A">{{ Number(info['个人积分']) || '0' }}</div>
+        <div class="label">个人总分</div>
+      </div>
+      <div class="item">
+        <div class="num color-CD413A">{{  info['个人排行'] || '0' }}</div>
+        <div class="label">个人排名</div>
+      </div>
+      <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+    </div>
+    <div v-if="!showDetail">
+      <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
+        <div class="item" v-if="info['列表'].length > 1">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+          <img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
+          <p class="item-num">{{ info['列表'][1].integral }}</p>
+        </div>
+        <div class="item-top item" v-if="info['列表'].length > 0">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+          <img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
+          <p class="item-num">{{ info['列表'][0].integral }}</p>
+        </div>
+        <div class="item" v-if="info['列表'].length > 2">
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+          <img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
+          <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
+          <p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
+          <p class="item-num">{{ info['列表'][2].integral }}</p>
+        </div>
+      </div>
+      <div class="ranking-list" v-if="info['列表'] &&  info['列表'].length">
+        <div class="item" v-for="(item, index) in info['列表']" :key="index" v-if="index > 2">
+          <span class="item-num">{{ index + 1 }}</span>
+          <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+          <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>
+      </div>
+    </div>
+    <div class="detail-content" v-if="showDetail && list.length">
+      <div class="title">积分明细</div>
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-info">
+          <p>{{ item.residentName + ':' }}{{ item.eventDesc }}</p>
+          <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+        </div>
+        <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+          {{ (item.integralCalcType == 1 ? '+':'-') + item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "userRank",
+  appName: "个人积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  props: {
+    showDetail: {  //true 积分明细 false积分排行
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      info: {},
+      current: 1,
+      list: [],
+    }
+  },
+  mounted() {
+    this.getInfo()
+    if(this.showDetail) {
+      this.getList()
+    }
+  },
+  methods: {
+    getInfo() {// 积分排行
+      this.info = {}
+      // var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}`  //积分排行
+      var url = `/app/appresident/rank?id=${this.user.residentId}&type=1&areaId=${this.user?.areaId}`  //积分排行
+      this.$instance.post(url).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+    
+    getList() {// 积分明细列表
+      // var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10`  //积分明细
+      let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&queryType=1&current=${this.current}&size=10`  //积分明细
+      this.$instance.post(url).then(res => {
+        if (res?.data) {
+          if (this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+  },
+  onReachBottom() {
+    if (this.list.length < 50) {
+      this.current++;
+      this.getList()
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+
+.pages {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+  height: calc(100% - 136px);
+
+    .bg-blue {
+      width: 100%;
+      height: 176px;
+      background-color: #4181FF;
+    }
+
+    .header-content {
+      width: 690px;
+      height: 256px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: -130px 0 40px 30px;
+      padding: 100px 60px 40px 60px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      position: relative;
+
+      .item {
+        text-align: center;
+        z-index: 99;
+
+        .num {
+          font-family: DIN;
+          font-size: 52px;
+          font-weight: bold;
+          line-height: 60px;
+        }
+
+        .label {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 40px;
+          margin-top: 10px;
+        }
+
+        .color-5AAD6A {
+          color: #5AAD6A;
+        }
+
+        .color-4185F5 {
+          color: #4185F5;
+        }
+
+        .color-CD413A {
+          color: #CD413A;
+        }
+      }
+
+      img {
+        position: absolute;
+        width: 360px;
+        height: 250px;
+        top: -40px;
+        right: 0;
+      }
+    }
+
+    .ranking-content {
+      padding: 94px 30px 0;
+      background-color: #fff;
+
+      .item {
+        display: inline-block;
+        width: 216px;
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12px;
+        padding: 40px 0 76px 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+
+        .user-name {
+          font-size: 30px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42px;
+        }
+
+        .item-num {
+          font-size: 46px;
+          font-weight: 6000;
+          color: #2C51CE;
+          line-height: 54px;
+        }
+
+        .top-img {
+          width: 100%;
+          height: 34px;
+          position: absolute;
+          top: -11px;
+          left: 0;
+        }
+      }
+
+      .item-top {
+        margin: -46px 20px 0;
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+        }
+
+        .user-name-bg {
+          width: 104px;
+          height: 104px;
+          border-radius: 50%;
+          background-color: #4E8EEE;
+          font-size: 28px;
+          line-height: 104px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22px;
+          left: 0;
+          height: 46px;
+        }
+      }
+    }
+
+    .ranking-list {
+      background-color: #fff;
+
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          color: #858594;
+          font-size: 28px;
+        }
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: 210px;
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+    .user-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+
+    .user-name-bg {
+      display: inline-block;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background-color: #4E8EEE;
+      font-size: 28px;
+      line-height: 80px;
+      text-align: center;
+      color: #fff;
+    }
+
+    .mar-b4 {
+      margin-bottom: 8px;
+    }
+
+    .mar-b8 {
+      margin-bottom: 16px;
+    }
+
+    .detail-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: 0 0 0 32px;
+      padding: 30px 30px 94px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 30px;
+      }
+
+      .item {
+        padding: 34px 0 32px 0;
+        border-bottom: 2px solid #ddd;
+        display: flex;
+
+        .item-info {
+          width: 500px;
+
+          p {
+            word-break: break-all;
+            font-size: 32px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+
+          span {
+            display: inline-block;
+            margin-top: 8px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34px;
+          }
+        }
+
+        .item-num {
+          width: calc(100% - 500px);
+          text-align: right;
+          font-size: 36px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50px;
+        }
+      }
+    }
+
+    .color-0 {
+      color: #2C51CE !important;
+    }
+
+    .color-1 {
+      color: #E6736E !important;
+    }
+
+    .fixed-top {
+      z-index: 999;
+    }
+}
+</style>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralRank.vue b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
new file mode 100644
index 0000000..ef1203e
--- /dev/null
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="integralRank">
+    <div class="credit-points">
+      <div class="fixed-top">
+        <div class="header-tab">
+          <div class="tab-item" :class="{ active: tabIndex == index }" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}<span
+              class="active-line" v-if="tabIndex == index"></span></div>
+        </div>
+      </div>
+      <div class="rank">
+        <div class="header-content">
+          <div class="item">
+            <span class="item-num">{{ index + 1 }}</span>
+            <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+            <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>
+        </div>
+        <div>
+          <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
+            <div class="item" v-if="info['列表'].length > 1">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/2.png" alt="" class="top-img">
+              <img :src="info['列表'][1].photo" alt="" class="user-img mar-b4" v-if="info['列表'][1].photo">
+              <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][1].name) }}</div>
+              <p class="user-name mar-b8">{{ info['列表'][1].name }}</p>
+              <p class="item-num">{{ info['列表'][1].integral }}</p>
+            </div>
+            <div class="item-top item" v-if="info['列表'].length > 0">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/1.png" alt="" class="top-img-one">
+              <img :src="info['列表'][0].photo" alt="" class="user-img mar-b4" v-if="info['列表'][0].photo">
+              <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][0].name) }}</div>
+              <p class="user-name mar-b8">{{ info['列表'][0].name }}</p>
+              <p class="item-num">{{ info['列表'][0].integral }}</p>
+            </div>
+            <div class="item" v-if="info['列表'].length > 2">
+              <img src="https://cdn.cunwuyun.cn/dvcp/credit/3.png" alt="" class="top-img">
+              <img :src="info['列表'][2].photo" alt="" class="user-img mar-b4" v-if="info['列表'][2].photo">
+              <div class="user-name-bg mar-b4" v-else>{{ $formatName(info['列表'][2].name) }}</div>
+              <p class="user-name mar-b8">{{ info['列表'][2].name }}</p>
+              <p class="item-num">{{ info['列表'][2].integral }}</p>
+            </div>
+          </div>
+          <div class="ranking-list" v-if="info['列表'] && info['列表'].length">
+            <div class="item" v-for="(item, index) in info['列表']" :key="index" v-if="index > 2">
+              <span class="item-num">{{ index + 1 }}</span>
+              <img :src="item.photo" alt="" class="user-img mar-b4" v-if="item.photo">
+              <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>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "integralRank",
+  appName: "积分排行",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      tabList: ['总榜','月榜','周榜'],
+      tabIndex: 0,
+      info: {},
+      current: 1,
+      userInfo: {},
+    }
+  },
+  onLoad() {
+    this.getList()
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.getList()
+    },
+    getList() {// 积分排行
+      this.info = {}
+      var url = `/app/appintegraluser/integralSortFD?type=${this.tabIndex}`  //积分排行
+      this.$instance.post(url).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)
+        }
+      })
+    },
+  },
+  onReachBottom() {
+    if (this.list.length < 50) {
+      this.current++;
+      this.getList()
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.integralRank {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  ::v-deep .header-tab {
+    background: #FFF;
+    .tab-item {
+      color: #222222;
+      font-size: 30px;
+      font-weight: 400;
+    }
+    .active {
+      font-size: 34px;
+      font-weight: 500;
+    }
+    .active-line {
+      background: #2D7DFF;
+    }
+  }
+
+  .fixed-top {
+    z-index: 999;
+  }
+
+  .rank {
+    width: 100vw;
+    overflow-x: hidden;
+    background-color: #f3f6f9;
+    height: calc(100% - 136px);
+    margin-top: 120px;
+
+    .header-content {
+      display: inline-block;
+      width: 216px;
+      box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+      border-radius: 12px;
+      padding: 40px 0 76px 0;
+      text-align: center;
+      box-sizing: border-box;
+      position: relative;
+
+      .user-name {
+        font-size: 30px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 42px;
+      }
+
+      .item-num {
+        font-size: 46px;
+        font-weight: 6000;
+        color: #2C51CE;
+        line-height: 54px;
+      }
+
+      .top-img {
+        width: 100%;
+        height: 34px;
+        position: absolute;
+        top: -11px;
+        left: 0;
+      }
+    }
+
+    .ranking-content {
+      padding: 94px 30px 0;
+      background-color: #fff;
+
+      .item {
+        display: inline-block;
+        width: 216px;
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12px;
+        padding: 40px 0 76px 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+
+        .user-name {
+          font-size: 30px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42px;
+        }
+
+        .item-num {
+          font-size: 46px;
+          font-weight: 6000;
+          color: #2C51CE;
+          line-height: 54px;
+        }
+
+        .top-img {
+          width: 100%;
+          height: 34px;
+          position: absolute;
+          top: -11px;
+          left: 0;
+        }
+      }
+
+      .item-top {
+        margin: -46px 20px 0;
+
+        .user-img {
+          width: 104px;
+          height: 104px;
+        }
+
+        .user-name-bg {
+          width: 104px;
+          height: 104px;
+          border-radius: 50%;
+          background-color: #4E8EEE;
+          font-size: 28px;
+          line-height: 104px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22px;
+          left: 0;
+          height: 46px;
+        }
+      }
+    }
+
+    .ranking-list {
+      background-color: #fff;
+
+      .item {
+        width: 100%;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          color: #858594;
+          font-size: 28px;
+        }
+
+        .user-img {
+          margin-right: 24px;
+          vertical-align: middle;
+        }
+
+        .item-name {
+          color: #333;
+          font-size: 30px;
+          display: inline-block;
+          width: 240px;
+        }
+
+        .item-point {
+          display: inline-block;
+          width: 210px;
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
+      }
+    }
+
+    .user-img {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+    }
+
+    .user-name-bg {
+      display: inline-block;
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background-color: #4E8EEE;
+      font-size: 28px;
+      line-height: 80px;
+      text-align: center;
+      color: #fff;
+    }
+
+    .mar-b4 {
+      margin-bottom: 8px;
+    }
+
+    .mar-b8 {
+      margin-bottom: 16px;
+    }
+
+    .detail-content {
+      width: 690px;
+      background: #FFF;
+      border-radius: 16px;
+      margin: 0 0 0 32px;
+      padding: 30px 30px 94px;
+      box-sizing: border-box;
+
+      .title {
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48px;
+        margin-bottom: 30px;
+      }
+
+      .item {
+        padding: 34px 0 32px 0;
+        border-bottom: 2px solid #ddd;
+        display: flex;
+
+        .item-info {
+          width: 500px;
+
+          p {
+            word-break: break-all;
+            font-size: 32px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+
+          span {
+            display: inline-block;
+            margin-top: 8px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34px;
+          }
+        }
+
+        .item-num {
+          width: calc(100% - 500px);
+          text-align: right;
+          font-size: 36px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50px;
+        }
+      }
+    }
+
+    .color-0 {
+      color: #2C51CE !important;
+    }
+
+    .color-1 {
+      color: #E6736E !important;
+    }
+
+    .fixed-top {
+      z-index: 999;
+    }
+}
+
+}
+</style>
diff --git a/src/project/fengdu/AppNewFarmerBank/integralTask.vue b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
index 4f0635d..ab16b0e 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralTask.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralTask.vue
@@ -40,12 +40,18 @@ export default {
   appName: '功德银行',
   data() {
     return {
-      list: []
+      list: [],
+      current: 1,
     }
   },
   methods: {
     getList() {
-      this.$instance.post('/app/appintegraltask/list?status=1').then(res=> {
+      this.$instance.post('/app/appintegraltask/list',null,{
+        params: {
+          current: this.current,
+          status: 1
+        }
+      }).then(res=> {
         if(res?.data) {
           this.list = res.data.records
         }
@@ -60,6 +66,10 @@ export default {
       this.getList()
     })
   },
+  onReachBottom() {
+    this.current++;
+    this.getList()
+  },
 }
 </script>