From 7dec22bd82b7f4a1da23e437e163c4f7e9a3bdb2 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Fri, 15 May 2020 16:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E4=B8=9A=E6=9C=8D=E5=8A=A1-?=
 =?UTF-8?q?=E7=BC=BA=E7=9C=81=E6=97=B6=E6=98=BE=E7=A4=BAbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=20-=E5=88=98=E7=BB=8D=E6=96=87=20-2020/05/15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/property.js                   | 16 +++++++++++++---
 .../pages/property/property.wxml                 |  6 +++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/property/property.js b/epdc-resident-mp-yushan/pages/property/property.js
index 2316f1b..1580c48 100644
--- a/epdc-resident-mp-yushan/pages/property/property.js
+++ b/epdc-resident-mp-yushan/pages/property/property.js
@@ -24,7 +24,8 @@ Page({
     if(this.data.refreshFlag){
       this.setData({
         tabList:[],
-        projectInfo:{}
+        projectInfo:{},
+        isLoading:true
       })
     }
   },
@@ -54,10 +55,14 @@ Page({
    */
   onShow: function () {
     if(this.data.refreshFlag){
+      this.setData({
+        isLoading:true
+      })
       this.initTab();
     }else{
       this.setData({
-        refreshFlag:true
+        refreshFlag:true,
+        isLoading:false
       })
     }
   },
@@ -69,10 +74,15 @@ Page({
       });
       if(this.data.tabList.length>0){
         this.initPropertyInfo(this.data.tabList[0].id);
+      }else{
+        this.setData({
+          isLoading:false
+        })
       }
     }).catch(err=>{
       this.setData({
-        tabList:[]
+        tabList:[],
+        isLoading:false
       })
     });
   },
diff --git a/epdc-resident-mp-yushan/pages/property/property.wxml b/epdc-resident-mp-yushan/pages/property/property.wxml
index 802f5a0..3869da1 100644
--- a/epdc-resident-mp-yushan/pages/property/property.wxml
+++ b/epdc-resident-mp-yushan/pages/property/property.wxml
@@ -108,9 +108,9 @@
   <!--加载更多提示-->
   <!-- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more> -->
 </view>
-<view wx:else class="nothing-to-show">
-<image src="../../images/property/nothing.png" class="nothing-img"></image>
-<view style="color: #BCBCBC;">管理员暂未添加物业项目信息~</view>
+<view wx:if="{{tabList.length == 0 && isLoading == false}}" class="nothing-to-show">
+  <image src="../../images/property/nothing.png" class="nothing-img"></image>
+  <view style="color: #BCBCBC;">管理员暂未添加物业项目信息~</view>
 </view>
 <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>