积分

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}`  //积分排行
+      this.$http.post(`/app/appresident/rank-qw?type=${this.tabIndex}&areaId=${this.areaId}`).then((res) => {
-      var url = `/app/appresident/rank?id=${this.user.residentId}&type=${this.tabIndex}&areaId=${this.areaId}`; //积分排行
-      this.$http.post(url).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%;

src/apps/AppSuperMarket/AppSuperMarket.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="AppSupermarket">
     <AiTopFixed>
-      <div class="header-top">
+      <div class="area-content">
-        <div>区域选择</div>
+        <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName">
-        <AiAreaPicker v-model="areaId" :areaId="user.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 {
+  .area-content {
-    display: flex;
+    width: 100%;
-    background: #fff;
+    line-height: 64px;
-    justify-content: space-between;
+
-    align-items: center;
+    img {
-    padding-top: 16px;
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
   }
   .item-bottom {
     display: flex;