From 17601dc953b4bbd70bb62e37df3ba6dced0b31be Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 18 Feb 2022 15:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppCreditPoints/AppCreditPoints.vue  |   9 +++--
 src/apps/AppSuperMarket/AppSuperMarket.vue    |  34 +++++++++++-------
 .../components/img/local-icon.png             | Bin 0 -> 1121 bytes
 3 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 src/apps/AppSuperMarket/components/img/local-icon.png

diff --git a/src/apps/AppCreditPoints/AppCreditPoints.vue b/src/apps/AppCreditPoints/AppCreditPoints.vue
index 753ea2c0..48420b7c 100644
--- a/src/apps/AppCreditPoints/AppCreditPoints.vue
+++ b/src/apps/AppCreditPoints/AppCreditPoints.vue
@@ -22,7 +22,7 @@
         </div>
       </AiTopFixed>
       <div class="line-bg"></div>
-      <div v-if="list.length">
+      <div v-if="info['列表'] && info['列表'].length">
         <div class="ranking-content" v-if="info['列表'] && info['列表'].length">
           <div class="item" v-if="info['列表'].length > 1">
             <img
@@ -133,6 +133,7 @@ export default {
     };
   },
   onLoad() {
+    this.areaId = this.user.areaId
     this.areaName = this.user.areaName || ''
     this.getInfo();
   },
@@ -151,9 +152,7 @@ export default {
     // 积分排行
     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.areaId}`; //积分排行
-      this.$http.post(url).then((res) => {
+      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).then((res) => {
         if (res.code === 0) {
           this.info = res.data;
         }
@@ -171,7 +170,7 @@ export default {
 <style scoped lang="scss">
 .page {
   width: 100%;
-  background-color: #f3f6f9;
+  // background-color: #f3f6f9;
   .credit-points {
     .bg-blue {
       width: 100%;
diff --git a/src/apps/AppSuperMarket/AppSuperMarket.vue b/src/apps/AppSuperMarket/AppSuperMarket.vue
index e1ffecf0..08178d4b 100644
--- a/src/apps/AppSuperMarket/AppSuperMarket.vue
+++ b/src/apps/AppSuperMarket/AppSuperMarket.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="AppSupermarket">
     <AiTopFixed>
-      <div class="header-top">
-        <div>区域选择</div>
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName">
+      <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-right" color="#666" size="24" style="margin-left:4px;" />
+          <u-icon name="arrow-down" color="#666" size="24"/>
         </AiAreaPicker>
       </div>
     </AiTopFixed>
@@ -38,7 +38,8 @@
         </div>
       </div>
     </div>
-    <AiEmpty v-else />
+    <AiEmpty description="此页面暂无数据，请选择区域到村级" v-if="!isAreaId && !numList.length"/>
+    <AiEmpty description="暂无数据" v-if="isAreaId && !numList.length" />
     <div class="goods-footer" v-if="numList.length">
       <div class="goods-footer__bottom">
         <div class="goods-footer__bottom__left">
@@ -75,6 +76,7 @@ export default {
       areaName: "",
       userInfo: {},
       propAreaId: "",
+      isAreaId: false
     };
   },
 
@@ -137,9 +139,10 @@ export default {
     areaSelect(e) {
       if(/[^0]0{0,2}$/.test(e)) {
         this.areaId = e
+        this.isAreaId = true
         this.getList()
       }else {
-        this.$u.toast('请选择到村级')
+        this.isAreaId = false
       }
     },
     getList() {
@@ -208,12 +211,19 @@ export default {
     height: 100%;
     background-color: #fff;
   }
-  .header-top {
-    display: flex;
-    background: #fff;
-    justify-content: space-between;
-    align-items: center;
-    padding-top: 16px;
+  .area-content {
+    width: 100%;
+    line-height: 64px;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
   }
   .item-bottom {
     display: flex;
diff --git a/src/apps/AppSuperMarket/components/img/local-icon.png b/src/apps/AppSuperMarket/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