From cdad9296a226de7dfd75793b4e7607a08b1b8010 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 17 Feb 2022 11:41:48 +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

---
 src/apps/AppCreditPoints/AppCreditPoints.vue  | 159 +++++++-----------
 .../components/img/local-icon.png             | Bin 0 -> 1121 bytes
 2 files changed, 57 insertions(+), 102 deletions(-)
 create mode 100644 src/apps/AppCreditPoints/components/img/local-icon.png

diff --git a/src/apps/AppCreditPoints/AppCreditPoints.vue b/src/apps/AppCreditPoints/AppCreditPoints.vue
index aece2f3b..753ea2c0 100644
--- a/src/apps/AppCreditPoints/AppCreditPoints.vue
+++ b/src/apps/AppCreditPoints/AppCreditPoints.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="page">
     <div class="credit-points">
-      <div class="fixed-top">
-        <div class="header-tab" style="background-color: #197df0">
+      <AiTopFixed>
+        <div class="header-tab">
           <div
             class="tab-item"
             v-for="(item, index) in tabList"
@@ -12,42 +12,17 @@
             {{ 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 class="area-content">
+          <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName">
+            <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>
-      </div>
-      <div v-if="!showDetail" style="padding-top: 432rpx">
+      </AiTopFixed>
+      <div class="line-bg"></div>
+      <div v-if="list.length">
         <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
           <div class="item" v-if="info['列表'].length > 1">
             <img
@@ -125,7 +100,7 @@
               v-if="item.photo"
             />
             <div class="user-name-bg mar-b4 mar-r24" v-else>
-              {{ $formatName(item.name) }}
+              {{ formatName(item.name) }}
             </div>
             <span class="item-name"
               >{{ item.name }}{{ tabIndex == 0 ? "家" : "" }}</span
@@ -134,28 +109,7 @@
           </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.description }}
-            </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 />
     </div>
   </div>
 </template>
@@ -166,39 +120,33 @@ export default {
   name: "AppCreditPoints",
   appName: '积分排行',
   computed: {
-    ...mapState(["user", "token"]),
+    ...mapState(["user"]),
   },
   data() {
     return {
       tabList: ["家庭积分", "个人积分"],
       tabIndex: 0,
-      showDetail: false, //是否显示积分明细
       info: {},
-      current: 1,
-      list: [],
-      areaId: "",
+      areaId: '',
+      areaName: '',
+      list: []
     };
   },
-  onLoad(options) {
-    // if (uni.getStorageSync("areaId")) {
-    //   this.areaId = uni.getStorageSync("areaId");
-    // } else {
-    //   this.areaId = this.$areaId;
-    // }
-    // if (options.type == "detail") {
-    //   this.showDetail = true;
-    //   this.getList();
-    // }
-    // uni.setNavigationBarTitle({
-    //   title: options.title,
-    // });
+  onLoad() {
+    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();
-      this.getList();
     },
     // 积分排行
     getInfo() {
@@ -211,29 +159,13 @@ export default {
         }
       });
     },
-    // 积分明细列表
-    getList() {
-      // var url = `/app/appvillagerintegraldetail/IntegralList?residentId=00255e188d1225f3fe022cb4eed44a84&type=${this.tabIndex}&current=${this.current}&size=10`  //积分明细
-      var url = `/app/appvillagerintegraldetail/IntegralList?residentId=${this.user.residentId}&type=${this.tabIndex}&current=${this.current}&size=10`; //积分明细
-      this.$http.post(url).then((res) => {
-        if (res.code === 0) {
-          if (this.current > res.data.pages) {
-            return;
-          }
-          const records =
-            this.current > 1
-              ? [...this.list, ...res.data.records]
-              : res.data.records;
-          this.list = records;
-        }
-      });
+    formatName(name) {
+      if (name == undefined) {
+        return
+      }
+      return name.substr(name.length - 2, name.length > 2 ? (name.length - 1) : name.length)
     },
   },
-  onReachBottom() {
-    if (!this.showDetail) return;
-    this.current = this.current + 1;
-    this.getList();
-  },
 };
 </script>
 <style scoped lang="scss">
@@ -244,7 +176,7 @@ export default {
     .bg-blue {
       width: 100%;
       height: 176rpx;
-      background-color: #197df0;
+      background-color: #3975C6;
     }
     .header-content {
       width: 690rpx;
@@ -471,7 +403,7 @@ export default {
   }
   .header-tab {
     height: 96rpx;
-    background-color: #4181FF;
+    background-color: #3975C6;
     padding: 20rpx 0;
     display: flex;
     align-items: center;
@@ -500,5 +432,28 @@ export default {
     transform: translate(-50%, -50%);
   }
 
+  .area-content {
+    width: 100%;
+    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>
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