From 7e9f5c27391469e328292af11a6602988e52f4bf Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 20 May 2022 15:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E6=94=B9=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppCreditPoints/AppCreditPoints.vue  |   6 +-
 .../AppCreditPoints/components/familyRank.vue | 283 +++++++----
 .../AppCreditPoints/components/img/line.png   | Bin 0 -> 700 bytes
 .../components/img/local-icon.png             | Bin 0 -> 1121 bytes
 .../components/sysUserIntegral.vue            |  11 +-
 .../AppCreditPoints/components/userRank.vue   | 276 +++++++----
 src/apps/AppCreditPoints/demo.vue             | 462 ++++++++++++++++++
 7 files changed, 851 insertions(+), 187 deletions(-)
 create mode 100644 src/apps/AppCreditPoints/components/img/line.png
 create mode 100644 src/apps/AppCreditPoints/components/img/local-icon.png
 create mode 100644 src/apps/AppCreditPoints/demo.vue

diff --git a/src/apps/AppCreditPoints/AppCreditPoints.vue b/src/apps/AppCreditPoints/AppCreditPoints.vue
index fbf419f4..aabacaeb 100644
--- a/src/apps/AppCreditPoints/AppCreditPoints.vue
+++ b/src/apps/AppCreditPoints/AppCreditPoints.vue
@@ -37,10 +37,8 @@ export default {
   onReachBottom() {
     uni.$emit("reachBottom")
   },
-  onShow(){
-    let index = JSON.parse(JSON.stringify(this.tabIndex))
-    this.tabIndex = null
-    this.$nextTick(()=>this.tabIndex = index)
+  onShow() {
+    uni.$emit("onShow")
   },
   methods: {
     tabClick(index) {
diff --git a/src/apps/AppCreditPoints/components/familyRank.vue b/src/apps/AppCreditPoints/components/familyRank.vue
index 85a4b5f5..333e777a 100644
--- a/src/apps/AppCreditPoints/components/familyRank.vue
+++ b/src/apps/AppCreditPoints/components/familyRank.vue
@@ -1,75 +1,109 @@
 <template>
-  <div class="familyRank">
-    <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="">
+  <section class="userRank">
+    <div class="area-content">
+      <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+        <img src="./img/local-icon.png" alt="">
+        <span class="label" v-if="areaName">{{ areaName }}</span>
+        <span v-else>请选择</span>
+        <u-icon name="arrow-down" color="#666" size="24"/>
+      </AiAreaPicker>
     </div>
-    <div v-if="!showDetail">
+    <u-gap height="6"/>
+    <div class="fill" v-if="info['列表'] && info['列表'].length">
       <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>
+          <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 }}</p>
-          <p class="item-num">{{ info['列表'][0].integral }}</p>
+          <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 }}</p>
-          <p class="item-num">{{ info['列表'][2].integral }}</p>
+          <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">
+      <u-gap height="6"/>
+      <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>
+          <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>{{ 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.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
-        </div>
-      </div>
-    </div>
-  </div>
+    <AiEmpty v-else/>
+  </section>
 </template>
 <script>
 import {mapState} from 'vuex'
 
 export default {
-  name: "familyRank",
-  appName: "家庭积分",
+  name: "userRank",
+  appName: "个人积分",
   computed: {
     ...mapState(['user', 'token'])
   },
@@ -83,46 +117,59 @@ export default {
       info: {},
       current: 1,
       list: [],
+      areaId: '',
+      areaName: '',
+      tabIndex: 0
     }
   },
-  mounted() {
-    this.getInfo()
-    if (this.showDetail) {
-      this.getList()
-    }
+  created() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName || ''
+    this.getInfo();
+    uni.$on("onShow", () => {
+      this.getInfo();
+    })
+    uni.$on("reachBottom", () => {
+      if (this.list.length < 50) {
+        this.current++;
+        this.getInfo()
+      }
+    })
   },
   methods: {
-    getInfo() {// 积分排行
-      this.info = {}
-      var url = `/app/appresident/rank?id=${this.user.residentId}&type=0&areaId=${this.user?.areaId}`  //积分排行
-      this.$http.post(url).then(res => {
-        if (res.code === 0) {
-          this.info = res.data
-        }
-      })
+    areaSelect(e) {
+      this.areaId = e
+      this.getInfo()
     },
-    getList() {// 积分明细列表
-      let url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&queryType=0&current=${this.current}&size=10`  //积分明细
-      this.$http.post(url).then(res => {
+    // 积分排行
+    getInfo() {
+      this.info = {};
+      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).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
+          this.info = res.data;
         }
-      })
+      });
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
     },
   },
+  destroyed() {
+    uni.$off("reachBottom")
+    uni.$off("onShow")
+  }
 }
 </script>
 <style scoped lang="scss">
-.familyRank {
+.userRank {
   width: 100vw;
-  overflow-x: hidden;
   background-color: #f3f6f9;
 
   .bg-blue {
-    width: 100vw;
+    width: 100%;
     height: 176px;
     background-color: #3975C6;
   }
@@ -130,7 +177,7 @@ export default {
   .header-content {
     width: 690px;
     height: 256px;
-    background: #FFF;
+    background: #fff;
     border-radius: 16px;
     margin: -130px 0 40px 30px;
     padding: 100px 60px 40px 60px;
@@ -159,15 +206,15 @@ export default {
       }
 
       .color-5AAD6A {
-        color: #5AAD6A;
+        color: #5aad6a;
       }
 
       .color-4185F5 {
-        color: #4185F5;
+        color: #4185f5;
       }
 
       .color-CD413A {
-        color: #CD413A;
+        color: #cd413a;
       }
     }
 
@@ -182,17 +229,18 @@ export default {
 
   .ranking-content {
     padding: 94px 30px 0;
-    background-color: #fff;
-
     .item {
       display: inline-block;
       width: 216px;
+      height: 320px;
       box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
       border-radius: 12px;
-      padding: 40px 0 76px 0;
+      padding: 40px 0 0 0;
       text-align: center;
       box-sizing: border-box;
       position: relative;
+      vertical-align: top;
+      background: #fff;
 
       .user-name {
         font-size: 30px;
@@ -200,12 +248,13 @@ export default {
         font-weight: 500;
         color: #333;
         line-height: 42px;
+        word-break: break-all;
       }
 
       .item-num {
         font-size: 46px;
         font-weight: 6000;
-        color: #2C51CE;
+        color: #2c51ce;
         line-height: 54px;
       }
 
@@ -220,6 +269,7 @@ export default {
 
     .item-top {
       margin: -46px 20px 0;
+      height: 366px;
 
       .user-img {
         width: 104px;
@@ -230,7 +280,7 @@ export default {
         width: 104px;
         height: 104px;
         border-radius: 50%;
-        background-color: #4E8EEE;
+        background-color: #4e8eee;
         font-size: 28px;
         line-height: 104px;
         text-align: center;
@@ -254,7 +304,7 @@ export default {
       width: 100%;
       height: 120px;
       line-height: 120px;
-      background: #FFF;
+      background: #fff;
       padding: 0 64px;
       box-sizing: border-box;
 
@@ -304,7 +354,7 @@ export default {
     width: 80px;
     height: 80px;
     border-radius: 50%;
-    background-color: #4E8EEE;
+    background-color: #4e8eee;
     font-size: 28px;
     line-height: 80px;
     text-align: center;
@@ -321,9 +371,9 @@ export default {
 
   .detail-content {
     width: 690px;
-    background: #FFF;
+    background: #fff;
     border-radius: 16px;
-    margin: 0 0 0 32px;
+    margin: 432px 0 0 32px;
     padding: 30px 30px 94px;
     box-sizing: border-box;
 
@@ -376,15 +426,66 @@ export default {
   }
 
   .color-0 {
-    color: #2C51CE !important;
+    color: #2c51ce !important;
   }
 
   .color-1 {
-    color: #E6736E !important;
+    color: #e6736e !important;
   }
 
   .fixed-top {
     z-index: 999;
   }
+
+  .header-tab {
+    height: 96px;
+    background-color: #3975C6;
+    padding: 20px 0;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .header-tab .tab-item {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    color: #fff;
+    font-size: 28px;
+  }
+
+  .header-tab .tab-active {
+    font-weight: 500;
+  }
+
+  .header-tab .active-line {
+    position: absolute;
+    width: 40px;
+    height: 4px;
+    background: #FFF;
+    top: 48px;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .area-content {
+    padding: 32px;
+    background-color: #fff;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
+  }
+
+
+  ::v-deep .content {
+    padding: 0;
+  }
 }
 </style>
diff --git a/src/apps/AppCreditPoints/components/img/line.png b/src/apps/AppCreditPoints/components/img/line.png
new file mode 100644
index 0000000000000000000000000000000000000000..bde78ee820f24f4e7ac3e5572cf074674acba05c
GIT binary patch
literal 700
zcmeAS@N?(olHy`uVBq!ia0y~yV0s5+b8s*N$%&3#en5&P-O<;Pfnj4m_n$;oAfK@~
z$lZxy-8q?;K#oglglC$sFM}44&B4Ifp2@%hQUb(MK+M3vynvAbWELYxYylHYmg(IB
zW*8f&4+#G8TH6Du$pJngu0ENCm)$o5(N*^?_lgtm6h{Erdl&ZX@I16P@F0-wy?4>&
z6!*(nZdbD0+uSc-$#ipDdb!Q*^5y03?m&h+2mv7oExY_Bz2|F2FOa;v!oAw<lE+mK
zpkk29EAC%1dO)h&+%CDfT}}d$n=S#3T5_r1?b7G;?n}!+5<o3L+0!{in}E*KC<*cl
zW@z~2D`|a$O`Uh6<l|#$4YSVNxR&p?aoIh~XKBaMK3XoAnKo-})%#!fs?G=ieeUe(
z;usQf`0cdQLQMuduB*koSzQG_=<Ykd{qO(v#m90t?MU7{@#Wq23tvo%ukiY;^r*Va
zJ*{!s(VNmfZrO{!bfum!S@$j>%RB4qlg?D3i^tBsX-%CqA<CM;{qEa~$CL}Au5VnZ
z9%s8jM@in{#fr%?s>OcNudjRz++V+$dEV1Y3xl_qa{OL4X|LVXg<Fcx^DLWNnf6=U
z%lhx@9sGT}<R?cNyB#-8^4r6Z8J{WdknvV#sjdHv{dU&+cZwg@3X3beZT;}|rqoiP
zu55vC&-<9NmubAMzNx#i{lS)?G+TYg8}jVR+#a3lzUgkh=y$I2;l8PN%~#!O*mC{Q
zb#ZZpH+PJ0FWj;|^D&F)%t+<ks<nI0%LLq-?j<(ilJmy57k@sK+hUvX`+v4|SM`N&
z3*PEpDC7CQ;H~5B=!I_u-Z|cG-nQNO_Wqv?p@pkgTgTd71f>*DS3j3^P6<r_Umh|Q

literal 0
HcmV?d00001

diff --git a/src/apps/AppCreditPoints/components/img/local-icon.png b/src/apps/AppCreditPoints/components/img/local-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e23aff6ab5f4ec6d80c86118da1c7f1f48fc80b
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF%Sl8*RA>e5SUqS{Q53%CCAKzc
z6$h!sZXJt=t>Vw5;-JMYf=)V!iiiz}b5#&s9JG*bRa`oVf-a>Bia1EI^iL5ti%Zc)
z6bH%ck2S}0lDzVopLfnnZt9W?;oaQx_kHJ{`}3YL^;XY7Jp=U&{Lc)4t>DK-u`xB9
zK4=UaHwJgovki^e#{MbDJdJ&$-UoV)w06YbJnw-e8?mb<uy+Vs|17%wh~_MTi|ar^
z8o)f<urYRP`~swOHl?*HCUEjGHq55n>jeCY9(W;$ERlhZ*4WJ_r(n5Is`+0L0nYmJ
zg8P(!AJ7DmbzrQaDR!cg*$7RbJGrzYgDay1zFh_uMg!&?i1th+8b5}z3ZtCQ{G@&G
z9txPFnb;j>CLGUHdUDO@%f@o%{gJVqHiTy!%Rd^_R}<g`Yp>?ZLqf#;xme|O{1Vj~
z$d}G65m0WE{t)5&0N_R(?3lRROy@^%Q_TSH^Xmnk;nFO`{$}7>F!Y>MB)}(Z?vT>B
zBOL&w3=TPtvu|@G-oiib^BBvNUYNxhjxFg&C57Dez^F<G4A6DKIX#_ddR^dmoc@n@
zB^MqUlNm;XZ3Xh8zr?g9^(B3X1TTt&z5#ItD5Z3_Q8dmjlmx$OoFzs&>Y2zu@2YW`
zj)DMR%;ZM9!Tl1MFEV5u)-4j07@)P#Sz>t2kb(e+)6E{K#viQl9Pmf0OC>3uIU)h?
zN*sVED{6tJPm+!&SL=e=?%9-kiUi6TuFp7%?+hXVs#ozaVKTpQL9ADgv|1P8hi6mn
zDH5O!nYKo`(SkcCYvnZ5x?sLbJ{1J`HBfG}R?gEte^}CF9oCifa&mkp=_v@{h~y+I
zM+AeJ;UE%O8R^g|OO+`%$G}TTOLWA?`TS@1r}{3$R|(qZd8_nx8?JdSn{4Kl;K|;F
zhS=7ri{J*45DBnxS2CR>0DVD@Y|H4S|K4<>`KshsQ9{P>*8@7L(vmY<a?1W<#4&d?
z{!|3`6^}A9pmAtL2h3f~y8y>h5nx6B^g**Q#{F70x<0(!)ET>>jiFitp0k?2)Mxj7
z*fo=gfAwNYPxTD2BQB+A1bgXQ;V;Q?XgT?eMB!){@Eju)0XCr8eD44pu}Xr#v(L#(
z@fnU0riCgYzvJ$~bXNxPl|i$`KOVZD2S3#ppAKzH1{D+FU{#Z-5<Fw5ia=E)EP%H{
zpdu2Mz*{2_iiAb*Rtcy`SO#yMKp=@4fUgOGk|b&bzGej2@t(n@&Xvr{ZMp<v1fu;D
neU0j`7HnT{^$gTApv%BNee`t*HU#Bi00000NkvXXu0mjftbXz<

literal 0
HcmV?d00001

diff --git a/src/apps/AppCreditPoints/components/sysUserIntegral.vue b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
index 6e296023..8a2a8eb7 100644
--- a/src/apps/AppCreditPoints/components/sysUserIntegral.vue
+++ b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
@@ -46,8 +46,11 @@ export default {
   },
   created() {
     this.getInfo()
-    uni.$on("reachBottom", onShow => {
-      !onShow && this.current++;
+    uni.$on("onShow", () => {
+      this.getInfo();
+    })
+    uni.$on("reachBottom", () => {
+      this.current++;
       this.getInfo()
     })
   },
@@ -69,6 +72,10 @@ export default {
     gotoGive() {
       uni.navigateTo({url: "./giveIntegral"})
     }
+  },
+  destroyed() {
+    uni.$off("reachBottom")
+    uni.$off("onShow")
   }
 }
 </script>
diff --git a/src/apps/AppCreditPoints/components/userRank.vue b/src/apps/AppCreditPoints/components/userRank.vue
index 2232aae2..a99c6d81 100644
--- a/src/apps/AppCreditPoints/components/userRank.vue
+++ b/src/apps/AppCreditPoints/components/userRank.vue
@@ -1,63 +1,101 @@
 <template>
   <section class="userRank">
-    <div class="bg-blue"/>
-    <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 class="area-content">
+      <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+        <img src="./img/local-icon.png" alt="">
+        <span class="label" v-if="areaName">{{ areaName }}</span>
+        <span v-else>请选择</span>
+        <u-icon name="arrow-down" color="#666" size="24"/>
+      </AiAreaPicker>
     </div>
-    <div v-if="!showDetail">
+    <u-gap height="6"/>
+    <div class="fill" v-if="info['列表'] && info['列表'].length">
       <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>
+          <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 }}</p>
-          <p class="item-num">{{ info['列表'][0].integral }}</p>
+          <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 }}</p>
-          <p class="item-num">{{ info['列表'][2].integral }}</p>
+          <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">
+      <u-gap height="6"/>
+      <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>
+          <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>{{ 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.changeIntegral > 0 ? '+' + item.changeIntegral : item.changeIntegral }}
-        </div>
-      </div>
-    </div>
+    <AiEmpty v-else/>
   </section>
 </template>
 <script>
@@ -79,51 +117,55 @@ export default {
       info: {},
       current: 1,
       list: [],
+      areaId: '',
+      areaName: '',
+      tabIndex: 1
     }
   },
-  mounted() {
-    this.getInfo()
-    if (this.showDetail) {
-      this.getList()
-    }
+  created() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName || ''
+    this.getInfo();
+    uni.$on("onShow", () => {
+      this.getInfo();
+    })
+    uni.$on("reachBottom", () => {
+      if (this.list.length < 50) {
+        this.current++;
+        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=1&areaId=${this.user?.areaId}`  //积分排行
-      this.$http.post(url).then(res => {
-        if (res.code === 0) {
-          this.info = res.data
-        }
-      })
+    areaSelect(e) {
+      this.areaId = e
+      this.getInfo()
     },
-
-    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.$http.post(url).then(res => {
+    // 积分排行
+    getInfo() {
+      this.info = {};
+      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).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
+          this.info = res.data;
         }
-      })
+      });
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
     },
   },
-  onReachBottom() {
-    if (this.list.length < 50) {
-      this.current++;
-      this.getList()
-    }
-  },
+  destroyed() {
+    uni.$off("reachBottom")
+    uni.$off("onShow")
+  }
 }
 </script>
 <style scoped lang="scss">
 .userRank {
   width: 100vw;
-  overflow-x: hidden;
   background-color: #f3f6f9;
 
   .bg-blue {
@@ -135,7 +177,7 @@ export default {
   .header-content {
     width: 690px;
     height: 256px;
-    background: #FFF;
+    background: #fff;
     border-radius: 16px;
     margin: -130px 0 40px 30px;
     padding: 100px 60px 40px 60px;
@@ -164,15 +206,15 @@ export default {
       }
 
       .color-5AAD6A {
-        color: #5AAD6A;
+        color: #5aad6a;
       }
 
       .color-4185F5 {
-        color: #4185F5;
+        color: #4185f5;
       }
 
       .color-CD413A {
-        color: #CD413A;
+        color: #cd413a;
       }
     }
 
@@ -187,17 +229,18 @@ export default {
 
   .ranking-content {
     padding: 94px 30px 0;
-    background-color: #fff;
-
     .item {
       display: inline-block;
       width: 216px;
+      height: 320px;
       box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
       border-radius: 12px;
-      padding: 40px 0 76px 0;
+      padding: 40px 0 0 0;
       text-align: center;
       box-sizing: border-box;
       position: relative;
+      vertical-align: top;
+      background: #fff;
 
       .user-name {
         font-size: 30px;
@@ -205,12 +248,13 @@ export default {
         font-weight: 500;
         color: #333;
         line-height: 42px;
+        word-break: break-all;
       }
 
       .item-num {
         font-size: 46px;
         font-weight: 6000;
-        color: #2C51CE;
+        color: #2c51ce;
         line-height: 54px;
       }
 
@@ -225,6 +269,7 @@ export default {
 
     .item-top {
       margin: -46px 20px 0;
+      height: 366px;
 
       .user-img {
         width: 104px;
@@ -235,7 +280,7 @@ export default {
         width: 104px;
         height: 104px;
         border-radius: 50%;
-        background-color: #4E8EEE;
+        background-color: #4e8eee;
         font-size: 28px;
         line-height: 104px;
         text-align: center;
@@ -259,7 +304,7 @@ export default {
       width: 100%;
       height: 120px;
       line-height: 120px;
-      background: #FFF;
+      background: #fff;
       padding: 0 64px;
       box-sizing: border-box;
 
@@ -309,7 +354,7 @@ export default {
     width: 80px;
     height: 80px;
     border-radius: 50%;
-    background-color: #4E8EEE;
+    background-color: #4e8eee;
     font-size: 28px;
     line-height: 80px;
     text-align: center;
@@ -326,9 +371,9 @@ export default {
 
   .detail-content {
     width: 690px;
-    background: #FFF;
+    background: #fff;
     border-radius: 16px;
-    margin: 0 0 0 32px;
+    margin: 432px 0 0 32px;
     padding: 30px 30px 94px;
     box-sizing: border-box;
 
@@ -381,15 +426,66 @@ export default {
   }
 
   .color-0 {
-    color: #2C51CE !important;
+    color: #2c51ce !important;
   }
 
   .color-1 {
-    color: #E6736E !important;
+    color: #e6736e !important;
   }
 
   .fixed-top {
     z-index: 999;
   }
+
+  .header-tab {
+    height: 96px;
+    background-color: #3975C6;
+    padding: 20px 0;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .header-tab .tab-item {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    color: #fff;
+    font-size: 28px;
+  }
+
+  .header-tab .tab-active {
+    font-weight: 500;
+  }
+
+  .header-tab .active-line {
+    position: absolute;
+    width: 40px;
+    height: 4px;
+    background: #FFF;
+    top: 48px;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .area-content {
+    padding: 32px;
+    background-color: #fff;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
+  }
+
+
+  ::v-deep .content {
+    padding: 0;
+  }
 }
 </style>
diff --git a/src/apps/AppCreditPoints/demo.vue b/src/apps/AppCreditPoints/demo.vue
new file mode 100644
index 00000000..ce4cd83d
--- /dev/null
+++ b/src/apps/AppCreditPoints/demo.vue
@@ -0,0 +1,462 @@
+<template>
+  <div class="page">
+    <div class="credit-points column" flex>
+      <AiTopFixed>
+        <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="area-content">
+          <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+            <img src="./components/img/local-icon.png" alt="">
+            <span class="label" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="24"/>
+          </AiAreaPicker>
+        </div>
+      </AiTopFixed>
+      <div class="line-bg"></div>
+      <div v-if="info['列表'] && info['列表'].length">
+        <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>
+      <AiEmpty v-else />
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+
+export default {
+  name: "AppCreditPoints",
+  appName: '积分排行',
+  computed: {
+    ...mapState(["user"]),
+  },
+  data() {
+    return {
+      tabList: ["家庭积分", "个人积分"],
+      tabIndex: 0,
+      info: {},
+      areaId: '',
+      areaName: '',
+      list: []
+    };
+  },
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName || ''
+    this.getInfo();
+  },
+  onShow() {
+    document.title = '积分排行'
+  },
+  methods: {
+    areaSelect(e) {
+      this.areaId = e
+      this.getInfo()
+    },
+    tabClick(index) {
+      this.tabIndex = index;
+      this.getInfo();
+    },
+    // 积分排行
+    getInfo() {
+      this.info = {};
+      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).then((res) => {
+        if (res.code === 0) {
+          this.info = res.data;
+        }
+      });
+    },
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.page {
+  width: 100%;
+  // background-color: #f3f6f9;
+  .credit-points {
+
+    .bg-blue {
+      width: 100%;
+      height: 176rpx;
+      background-color: #3975C6;
+    }
+    .header-content {
+      width: 690rpx;
+      height: 256rpx;
+      background: #fff;
+      border-radius: 16rpx;
+      margin: -130rpx 0 40rpx 30rpx;
+      padding: 100rpx 60rpx 40rpx 60rpx;
+      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: 52rpx;
+          font-weight: bold;
+          line-height: 60rpx;
+        }
+        .label {
+          font-size: 28rpx;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 40rpx;
+          margin-top: 10rpx;
+        }
+        .color-5AAD6A {
+          color: #5aad6a;
+        }
+        .color-4185F5 {
+          color: #4185f5;
+        }
+        .color-CD413A {
+          color: #cd413a;
+        }
+      }
+      img {
+        position: absolute;
+        width: 360rpx;
+        height: 250rpx;
+        top: -40rpx;
+        right: 0;
+      }
+    }
+    .ranking-content {
+      padding: 94rpx 30rpx 0;
+      background-color: #fff;
+      .item {
+        display: inline-block;
+        width: 216rpx;
+        height: 320px;
+        box-shadow: 0 4rpx 20rpx 0 rgba(0, 0, 0, 0.12);
+        border-radius: 12rpx;
+        padding: 40rpx 0 0 0;
+        text-align: center;
+        box-sizing: border-box;
+        position: relative;
+        vertical-align: top;
+        .user-name {
+          font-size: 30rpx;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 42rpx;
+          word-break: break-all;
+        }
+        .item-num {
+          font-size: 46rpx;
+          font-weight: 6000;
+          color: #2c51ce;
+          line-height: 54rpx;
+        }
+        .top-img {
+          width: 100%;
+          height: 34rpx;
+          position: absolute;
+          top: -11rpx;
+          left: 0;
+        }
+      }
+      .item-top {
+        margin: -46rpx 20rpx 0;
+        height: 366px;
+        .user-img {
+          width: 104rpx;
+          height: 104rpx;
+        }
+        .user-name-bg {
+          width: 104rpx;
+          height: 104rpx;
+          border-radius: 50%;
+          background-color: #4e8eee;
+          font-size: 28rpx;
+          line-height: 104rpx;
+          text-align: center;
+          color: #fff;
+        }
+        .top-img-one {
+          width: 100%;
+          position: absolute;
+          top: -22rpx;
+          left: 0;
+          height: 46rpx;
+        }
+      }
+    }
+    .ranking-list {
+      background-color: #fff;
+      .item {
+        width: 100%;
+        height: 120rpx;
+        line-height: 120rpx;
+        background: #fff;
+        padding: 0 64rpx;
+        box-sizing: border-box;
+        .item-num {
+          display: inline-block;
+          width: 68rpx;
+          color: #858594;
+          font-size: 28rpx;
+        }
+        .user-img {
+          margin-right: 24rpx;
+          vertical-align: middle;
+        }
+        .item-name {
+          color: #333;
+          font-size: 30rpx;
+          display: inline-block;
+          width: 240rpx;
+        }
+        .item-point {
+          display: inline-block;
+          width: 210rpx;
+          text-align: right;
+          font-size: 30rpx;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+        }
+        .mar-r24 {
+          margin-right: 24rpx;
+        }
+      }
+    }
+    .user-img {
+      width: 80rpx;
+      height: 80rpx;
+      border-radius: 50%;
+    }
+    .user-name-bg {
+      display: inline-block;
+      width: 80rpx;
+      height: 80rpx;
+      border-radius: 50%;
+      background-color: #4e8eee;
+      font-size: 28rpx;
+      line-height: 80rpx;
+      text-align: center;
+      color: #fff;
+    }
+    .mar-b4 {
+      margin-bottom: 8rpx;
+    }
+    .mar-b8 {
+      margin-bottom: 16rpx;
+    }
+    .detail-content {
+      width: 690rpx;
+      background: #fff;
+      border-radius: 16rpx;
+      margin: 432rpx 0 0 32rpx;
+      padding: 30rpx 30rpx 94rpx;
+      box-sizing: border-box;
+      .title {
+        font-size: 34rpx;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 48rpx;
+        margin-bottom: 30rpx;
+      }
+      .item {
+        padding: 34rpx 0 32rpx 0;
+        border-bottom: 2rpx solid #ddd;
+        display: flex;
+        .item-info {
+          width: 500rpx;
+          p {
+            word-break: break-all;
+            font-size: 32rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #333;
+            line-height: 44px;
+          }
+          span {
+            display: inline-block;
+            margin-top: 8rpx;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            line-height: 34rpx;
+          }
+        }
+        .item-num {
+          width: calc(100% - 500rpx);
+          text-align: right;
+          font-size: 36rpx;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          line-height: 50rpx;
+        }
+      }
+    }
+  }
+  .color-0 {
+    color: #2c51ce !important;
+  }
+  .color-1 {
+    color: #e6736e !important;
+  }
+  .fixed-top {
+    z-index: 999;
+  }
+  .header-tab {
+    height: 96rpx;
+    background-color: #3975C6;
+    padding: 20rpx 0;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+  }
+
+  .header-tab .tab-item {
+    flex: 1;
+    text-align: center;
+    position: relative;
+    color: #fff;
+    font-size: 28rpx;
+  }
+
+  .header-tab .tab-active {
+    font-weight: 500;
+  }
+
+  .header-tab .active-line {
+    position: absolute;
+    width: 40rpx;
+    height: 4rpx;
+    background: #FFF;
+    top: 48rpx;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .area-content {
+    padding: 32px;
+    background-color: #fff;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 6px;
+    background-color: #f3f6f9;
+  }
+  ::v-deep .content{
+    padding: 0;
+  }
+}
+</style>