From 4288d70f0a59e7791a05a0dc86a6efc95083fac2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 29 Mar 2023 17:46:29 +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     |  15 +-
 .../components/familyRank.vue                 | 393 -----------------
 .../AppNewFarmerBank/components/userRank.vue  | 397 ------------------
 .../fengdu/AppNewFarmerBank/integralRank.vue  | 162 ++++---
 4 files changed, 111 insertions(+), 856 deletions(-)
 delete mode 100644 src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
 delete mode 100644 src/project/fengdu/AppNewFarmerBank/components/userRank.vue

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index 6d1bf6b..0f79f6d 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="$linkTo('/mods/AppNewFarmerBank/concentrationTask')">
+      <div class="jsrw" @click="toPages('/mods/AppNewFarmerBank/concentrationTask')">
         <p>积分任务</p>
         <h4>完成任务得积分</h4>
       </div>
@@ -64,6 +64,19 @@ export default {
     },
     handleBannerClick() {
 
+    },
+    toPages(url) {
+      if(!this.user.idNumber) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('/mods/AppMine/userInfo')
+        }).catch(() => {
+        })
+      } else {
+        this.$linkTo(url)
+      }
     }
   },
   onShow() {
diff --git a/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue b/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
deleted file mode 100644
index 038db58..0000000
--- a/src/project/fengdu/AppNewFarmerBank/components/familyRank.vue
+++ /dev/null
@@ -1,393 +0,0 @@
-<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
deleted file mode 100644
index a560153..0000000
--- a/src/project/fengdu/AppNewFarmerBank/components/userRank.vue
+++ /dev/null
@@ -1,397 +0,0 @@
-<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
index ef1203e..b0b66f9 100644
--- a/src/project/fengdu/AppNewFarmerBank/integralRank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/integralRank.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="integralRank">
+  <div class="integralRank" v-if="pageShow">
     <div class="credit-points">
       <div class="fixed-top">
         <div class="header-tab">
@@ -10,44 +10,47 @@
       <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>
+            <span class="item-num">{{ inx }}</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>
           </div>
         </div>
+        <div class="faultage"></div>
         <div>
-          <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
-            <div class="item" v-if="info['列表'].length > 1">
+          <div class="ranking-content" v-if="list && list.length">
+            <div class="item" v-if="list.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>
+              <img :src="list[1].avatar_url" alt="" class="user-img mar-b4" v-if="list[1].avatar_url">
+              <!-- <div class="user-name-bg mar-b4" v-else>{{ $formatName(list[1].name) }}</div> -->
+              <p class="user-name mar-b8">{{ list[1].name }}</p>
+              <p class="item-num">{{ list[1].integral }}</p>
             </div>
-            <div class="item-top item" v-if="info['列表'].length > 0">
+            <div class="item-top item" v-if="list.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>
+              <img :src="list[0].avatar_url" alt="" class="user-img mar-b4" v-if="list[0].avatar_url">
+              <!-- <div class="user-name-bg mar-b4" v-else>{{ $formatName(list[0].name) }}</div> -->
+              <p class="user-name mar-b8">{{ list[0].name }}</p>
+              <p class="item-num">{{ list[0].integral }}</p>
             </div>
-            <div class="item" v-if="info['列表'].length > 2">
+            <div class="item" v-if="list.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>
+              <img :src="list[2].avatar_url" alt="" class="user-img mar-b4" v-if="list[2].avatar_url">
+              <!-- <div class="user-name-bg mar-b4" v-else>{{ $formatName(list[2].name) }}</div> -->
+              <p class="user-name mar-b8">{{ list[2].name }}</p>
+              <p class="item-num">{{ list[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 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">
+                <span class="item-num">{{ index + 1 }}</span>
+                <img :src="item.avatar_url" alt="" class="user-img mar-b4" v-if="item.avatar_url">
+                <!-- <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>
@@ -67,9 +70,11 @@ export default {
     return {
       tabList: ['总榜','月榜','周榜'],
       tabIndex: 0,
-      info: {},
       current: 1,
       userInfo: {},
+      inx: 0,
+      pageShow: false,
+      list: []
     }
   },
   onLoad() {
@@ -84,12 +89,15 @@ export default {
       this.getList()
     },
     getList() {// 积分排行
-      this.info = {}
+      this.list = {}
       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)
+          this.list = res.data.map(e=> ({...e, index: e.index}))
+          this.userInfo = res.data.filter(e => e.open_id === this.user.openId)[0]
+          this.inx = res.data.findIndex(e=> e.open_id == this.user.openId)
+          console.log(this.inx);
+          this.pageShow = true
         }
       })
     },
@@ -133,47 +141,67 @@ export default {
   .rank {
     width: 100vw;
     overflow-x: hidden;
-    background-color: #f3f6f9;
     height: calc(100% - 136px);
-    margin-top: 120px;
+    margin-top: 96px;
 
     .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 {
+      .item {
         width: 100%;
-        height: 34px;
-        position: absolute;
-        top: -11px;
-        left: 0;
+        height: 120px;
+        line-height: 120px;
+        background: #FFF;
+        padding: 0 64px;
+        box-sizing: border-box;
+        border: 4px solid #2d7dffff;
+
+        .item-num {
+          display: inline-block;
+          width: 68px;
+          height: 112px;
+          line-height: 112px;
+          color: #858594;
+          font-size: 28px;
+          vertical-align: top;
+        }
+
+
+        .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: calc(100% - 420px);
+          text-align: right;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+
+        .mar-r24 {
+          margin-right: 24px;
+        }
       }
     }
 
+    .faultage {
+      width: 100%;
+      height: 32px;
+      background: #f3f5f7;
+    }
+
     .ranking-content {
       padding: 94px 30px 0;
-      background-color: #fff;
+      background: #fff;
 
       .item {
         display: inline-block;
@@ -211,6 +239,8 @@ export default {
 
       .item-top {
         margin: -46px 20px 0;
+        vertical-align: top;
+        height: 370px;
 
         .user-img {
           width: 104px;
@@ -254,6 +284,7 @@ export default {
           width: 68px;
           color: #858594;
           font-size: 28px;
+          vertical-align: top;
         }
 
         .user-img {
@@ -284,6 +315,7 @@ export default {
       }
     }
 
+
     .user-img {
       width: 80px;
       height: 80px;