Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppGridManagement/FamilyList.vue

@@ -21,6 +21,7 @@
         </li>
       </ul>
     </div>
+    <AiEmpty description="暂无数据" class="emptyWrap" v-if="!list.length"></AiEmpty>
     <div class="footer" @click="toAddFamily()" v-if="checkType == 2">新增责任家庭</div>
   </div>
 </template>

src/apps/AppGridManagement/Organization.vue

@@ -6,7 +6,7 @@
         {{userGird.girdName}}
         <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
       </div>
-      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
+      <span @click="linkTo('./SetGird')">网格配置</span>
     </div>
     <div class="title">网格人员</div>
     <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">

src/apps/AppGridManagement/Statistics.vue

@@ -100,9 +100,10 @@ export default {
           this.girdUser = res.data
           this.checkType = res.data.checkType
           if (this.girdUser.checkType != '0') {
-            this.getList()
+            
             if (this.girdUser.appGirdInfo) {
               this.girdMsgList = this.girdUser.appGirdInfo
+              this.getList()
             }
           } else {
             this.$u.toast('当前人员不是网格员或网格管理员')
@@ -112,7 +113,7 @@ export default {
     },
 
     getList() {
-      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.girdMsgList.girdId}`).then((res) => {
+      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.girdMsgList.id}`).then((res) => {
         if (res.code == 0) {
           this.peopleList = res.data
         }