From 85b606c208ccd836b5eac0afa09cd359d614a939 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 10 May 2022 14:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A7=AF=E5=88=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/AppCreditPoints/AppCreditPoints.vue  | 111 +----
 .../AppCreditPoints/AppCreditPointsOld.vue    | 420 ++++++++++++++++++
 .../AppCreditPoints/components/familyRank.vue | 361 +++++++++++++++
 .../AppCreditPoints/components/userRank.vue   | 398 +++++++++++++++++
 4 files changed, 1186 insertions(+), 104 deletions(-)
 create mode 100644 src/mods/AppCreditPoints/AppCreditPointsOld.vue
 create mode 100644 src/mods/AppCreditPoints/components/familyRank.vue
 create mode 100644 src/mods/AppCreditPoints/components/userRank.vue

diff --git a/src/mods/AppCreditPoints/AppCreditPoints.vue b/src/mods/AppCreditPoints/AppCreditPoints.vue
index ae8e60f..99843fe 100644
--- a/src/mods/AppCreditPoints/AppCreditPoints.vue
+++ b/src/mods/AppCreditPoints/AppCreditPoints.vue
@@ -3,141 +3,44 @@
     <div class="credit-points">
       <div class="fixed-top">
         <div class="header-tab">
-          <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}<span
-              class="active-line" v-if="tabIndex == index"></span></div>
-        </div>
-        <div class="bg-blue"></div>
-        <div class="header-content">
-          <div class="item">
-            <div class="num color-5AAD6A">{{ tabIndex == 0 ? info['家庭积分'] || '0' : Number(info['个人积分']) || '0' }}</div>
-            <div class="label">{{ tabIndex == 0 ? '家庭' : '个人' }}总分</div>
-          </div>
-          <div class="item" v-if="tabIndex != 1">
-            <div class="num color-4185F5">{{ tabIndex == 0 ? info['剩余总分'] || '0' : info['个人积分'] || '0' }}</div>
-            <div class="label">剩余总分</div>
-          </div>
-          <div class="item">
-            <div class="num color-CD413A">{{ tabIndex == 0 ? info['家庭排行'] || '0' : info['个人排行'] || '0' }}</div>
-            <div class="label">{{ tabIndex == 0 ? '家庭' : '个人' }}排名</div>
-          </div>
-          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
-        </div>
-      </div>
-      <div v-if="!showDetail" style="padding-top:432rpx;">
-        <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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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>{{ tabIndex == 0 ? item.residentName + ':' : '' }}{{ item.ruleName }}</p>
-            <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
-          </div>
-          <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
-            {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
-          </div>
+          <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}<span class="active-line" v-if="tabIndex == index"></span></div>
         </div>
+        <user-rank v-if="tabIndex == 1" :showDetail="showDetail"></user-rank>
+        <family-rank v-if="tabIndex != 1"></family-rank>
       </div>
     </div>
   </div>
 </template>
 <script>
 import {mapState} from 'vuex'
-
+import userRank from './components/userRank.vue'
+import familyRank from './components/familyRank.vue'
 export default {
   name: "AppCreditPoints",
   appName: "我的积分",
   computed: {
     ...mapState(['user', 'token'])
   },
+  components: {userRank, familyRank},
   data() {
     return {
       tabList: ['家庭积分', '个人积分'],
       tabIndex: 0,
-      showDetail: false, //是否显示积分明细
-      info: {},
-      current: 1,
-      list: [],
+      showDetail: false
     }
   },
   onLoad(options) {
     if (options.type == 'detail') {
       this.showDetail = true
-      this.getList()
     }
     uni.setNavigationBarTitle({
       title: options.title
     })
-    this.getInfo()
   },
   methods: {
     tabClick(index) {
       this.tabIndex = index
-      this.getInfo()
-      this.getList()
     },
-    // 积分排行
-    getInfo() {
-      this.info = {}
-      // var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}`  //积分排行
-      var url = `/app/appresident/rank?id=${this.user.residentId}&type=${this.tabIndex}&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}&type=${this.tabIndex}&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.showDetail) return
-    if (this.list.length < 50) {
-      this.current++;
-      this.getList()
-    }
   },
 }
 </script>
diff --git a/src/mods/AppCreditPoints/AppCreditPointsOld.vue b/src/mods/AppCreditPoints/AppCreditPointsOld.vue
new file mode 100644
index 0000000..ae8e60f
--- /dev/null
+++ b/src/mods/AppCreditPoints/AppCreditPointsOld.vue
@@ -0,0 +1,420 @@
+<template>
+  <div class="page">
+    <div class="credit-points">
+      <div class="fixed-top">
+        <div class="header-tab">
+          <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">{{ item }}<span
+              class="active-line" v-if="tabIndex == index"></span></div>
+        </div>
+        <div class="bg-blue"></div>
+        <div class="header-content">
+          <div class="item">
+            <div class="num color-5AAD6A">{{ tabIndex == 0 ? info['家庭积分'] || '0' : Number(info['个人积分']) || '0' }}</div>
+            <div class="label">{{ tabIndex == 0 ? '家庭' : '个人' }}总分</div>
+          </div>
+          <div class="item" v-if="tabIndex != 1">
+            <div class="num color-4185F5">{{ tabIndex == 0 ? info['剩余总分'] || '0' : info['个人积分'] || '0' }}</div>
+            <div class="label">剩余总分</div>
+          </div>
+          <div class="item">
+            <div class="num color-CD413A">{{ tabIndex == 0 ? info['家庭排行'] || '0' : info['个人排行'] || '0' }}</div>
+            <div class="label">{{ tabIndex == 0 ? '家庭' : '个人' }}排名</div>
+          </div>
+          <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
+        </div>
+      </div>
+      <div v-if="!showDetail" style="padding-top:432rpx;">
+        <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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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 }}{{ tabIndex == 0 ? '家' : '' }}</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>{{ tabIndex == 0 ? item.residentName + ':' : '' }}{{ item.ruleName }}</p>
+            <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+          </div>
+          <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+            {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppCreditPoints",
+  appName: "我的积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      tabList: ['家庭积分', '个人积分'],
+      tabIndex: 0,
+      showDetail: false, //是否显示积分明细
+      info: {},
+      current: 1,
+      list: [],
+    }
+  },
+  onLoad(options) {
+    if (options.type == 'detail') {
+      this.showDetail = true
+      this.getList()
+    }
+    uni.setNavigationBarTitle({
+      title: options.title
+    })
+    this.getInfo()
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.getInfo()
+      this.getList()
+    },
+    // 积分排行
+    getInfo() {
+      this.info = {}
+      // var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}`  //积分排行
+      var url = `/app/appresident/rank?id=${this.user.residentId}&type=${this.tabIndex}&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}&type=${this.tabIndex}&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.showDetail) return
+    if (this.list.length < 50) {
+      this.current++;
+      this.getList()
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100vw;
+  overflow-x: hidden;
+  background-color: #f3f6f9;
+
+  .credit-points {
+    .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: 432px 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/mods/AppCreditPoints/components/familyRank.vue b/src/mods/AppCreditPoints/components/familyRank.vue
new file mode 100644
index 0000000..17c1ea7
--- /dev/null
+++ b/src/mods/AppCreditPoints/components/familyRank.vue
@@ -0,0 +1,361 @@
+<template>
+  <div class="page">
+    <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>
+      <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>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "familyRank",
+  appName: "家庭积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  data() {
+    return {
+      info: {},
+    }
+  },
+  mounted() {
+    this.getInfo()
+  },
+  methods: {
+    // 积分排行
+    getInfo() {
+      this.info = {}
+      // var url = `/app/appresident/rank?id=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}`  //积分排行
+      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
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100vw;
+  overflow-x: hidden;
+  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: 432px 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/mods/AppCreditPoints/components/userRank.vue b/src/mods/AppCreditPoints/components/userRank.vue
new file mode 100644
index 0000000..1045df8
--- /dev/null
+++ b/src/mods/AppCreditPoints/components/userRank.vue
@@ -0,0 +1,398 @@
+<template>
+  <div class="page">
+    <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.ruleName }}</p>
+          <span>&nbsp;&nbsp;&nbsp;{{ item.doTime }}</span>
+        </div>
+        <div class="item-num" :class="'color-'+ (item.changeIntegral >= 0 ? 0 : 1)">
+          {{ item.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "userRank",
+  appName: "个人积分",
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  props: {
+    showDetail: {
+      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}&type=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">
+@import "~dvcp-wui/common";
+
+.page {
+  width: 100vw;
+  overflow-x: hidden;
+  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: 432px 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>