From 89811cee51f011d27959d61ea045506239a4a162 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 14:24:09 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/Organization.vue | 1 +
 src/apps/AppGridManagement/SetGird.vue      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index a039bf97..6bf48c19 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -29,6 +29,7 @@
         <p>{{item.girdName}} </p>
       </div>
     </div>
+    <AiEmpty description="暂无数据" class="emptyWrap" v-if="!dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
     <div class="pad-b112"></div>
   </div>
 </template>
diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue
index 26207a1c..877d82f6 100644
--- a/src/apps/AppGridManagement/SetGird.vue
+++ b/src/apps/AppGridManagement/SetGird.vue
@@ -44,7 +44,7 @@
         </div>
         <div v-if="form.girdMemberManageList && form.girdMemberManageList.length">
           <div class="info-flex" v-for="(item, index) in  form.girdMemberManageList" :key="index">
-            <span class="label">网格负责人</span>
+            <span class="label">网格长</span>
             <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
               <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
                    v-if="item.phone">

From 90b5ecd75586d94624a3c557dd6e76966bdd6897 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 14:26:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/FamilyList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index aba29e71..9f99d4bb 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -6,8 +6,8 @@
         <li>
           <div class="user">
             <div>
-              <img src="./components/img/user-img.png" alt="" class="userImg">
-              <!-- <img src="./components/img/user-img.png" alt="" class="userImg"> -->
+              <img :src="item.photo" class="userImg" v-if="item.photo">
+              <img src="./components/img/user-img.png" alt="" class="userImg" v-else>
             </div>
             <div class="info">
               <div class="name">

From 83ae7eaedaeb3d98d11e263f0b6d88f3d9bcecaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 14 Jan 2022 14:27:40 +0800
Subject: [PATCH 3/6] css

---
 src/apps/AppEpidemicSituation/HealthDetail.vue          | 6 ++++--
 src/apps/AppResidentActivitie/AppResidentActivities.vue | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue
index 64bbc2f1..2ac95e5d 100644
--- a/src/apps/AppEpidemicSituation/HealthDetail.vue
+++ b/src/apps/AppEpidemicSituation/HealthDetail.vue
@@ -145,10 +145,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
 .HealthDetail {
   height: 100%;
-  // padding-bottom: 120px;
-  background: #f3f6f9;
+  background: #f5f5f5 !important;
   .top {
     .templates {
       display: flex;
diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index 33b31b68..9660fc76 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -103,6 +103,7 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.$forceUpdate()
 
             this.total = res.data.total
             this.pages = res.data.pages

From d3e505eda79068f680fd8ffbcd18a89ab99253e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 14 Jan 2022 14:29:41 +0800
Subject: [PATCH 4/6] 26746

---
 src/apps/AppGridManagement/Statistics.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue
index 07080687..fe32e4de 100644
--- a/src/apps/AppGridManagement/Statistics.vue
+++ b/src/apps/AppGridManagement/Statistics.vue
@@ -56,7 +56,7 @@
         <div class="boxes">
           <span class="boxesLeft">网格层级</span>
 
-          <span class="boxesRight">{{ $dict.getLabel('girdType', girdMsgList.girdLevel) || '' }}</span>
+          <span class="boxesRight">{{ $dict.getLabel('girdLevel', girdMsgList.girdLevel) || '' }}</span>
         </div>
       </div>
     </div>
@@ -89,7 +89,7 @@ export default {
     uni.$on('goback', (res) => {
       this.girdMsgList = res
       this.getList()
-    }) 
+    })
   },
   methods: {
     isGirdUser() {

From 23e216cf8a6fbd9435e1fc288bd4d905b7f83460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 14 Jan 2022 14:35:17 +0800
Subject: [PATCH 5/6] bug

---
 src/apps/AppGridManagement/Statistics.vue      | 18 ++++++++++--------
 .../AppResidentDocument.vue                    | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue
index fe32e4de..4aa3df01 100644
--- a/src/apps/AppGridManagement/Statistics.vue
+++ b/src/apps/AppGridManagement/Statistics.vue
@@ -15,14 +15,14 @@
 
       <div class="card">
         <div class="box">
-          <span class="count" v-if="peopleList && peopleList['网格长']">{{ peopleList['网格长']}}</span>
+          <span class="count" v-if="peopleList && peopleList['网格长']">{{ peopleList['网格长'] }}</span>
           <span class="count" v-else>0</span>
           <span class="girdCount">网格长</span>
         </div>
 
         <div class="box">
-          <span class="count" v-if="peopleList && peopleList['网格员'] ">{{ peopleList['网格员']}}</span>
-           <span class="count" v-else>0</span>
+          <span class="count" v-if="peopleList && peopleList['网格员']">{{ peopleList['网格员'] }}</span>
+          <span class="count" v-else>0</span>
           <span class="girdCount">网格员</span>
         </div>
 
@@ -77,15 +77,17 @@ export default {
       girdUser: [],
       peopleList: {},
       girdMsgList: {},
-      checkType: ''
+      checkType: '',
     }
   },
   computed: {},
   watch: {},
   onLoad() {},
   mounted() {
-    this.$dict.load('girdType', 'girdLevel').then(() => {})
-    this.isGirdUser()
+    this.$dict.load('girdType', 'girdLevel').then(() => {
+      this.isGirdUser()
+    })
+
     uni.$on('goback', (res) => {
       this.girdMsgList = res
       this.getList()
@@ -117,8 +119,8 @@ export default {
       })
     },
     linkTo(url) {
-      uni.navigateTo({url})
-    }
+      uni.navigateTo({ url })
+    },
   },
 }
 </script>
diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index eccba2e2..bcde1ca2 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -20,7 +20,7 @@
       <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
 
-    <div class="datas" v-if="datas.length > 0">
+    <div class="dataes" v-if="datas.length > 0">
       <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
         <div class="left">
           <img :src="item.photo" alt="" v-if="item.photo" />
@@ -38,7 +38,7 @@
       </div>
     </div>
 
-    <AiEmpty v-else></AiEmpty>
+    <AiEmpty class="emptyWrap" v-else></AiEmpty>
   </div>
 </template>
 
@@ -66,7 +66,7 @@ export default {
       ],
       currentTabs: 0,
       areaId: '',
-      areaName: ''
+      areaName: '',
     }
   },
   computed: {
@@ -153,11 +153,13 @@ export default {
     height: 16px;
     background: #f5f5f5;
   }
+
   .seachObjs {
     border-bottom: 2px solid #f5f5f5;
     border-top: 2px solid #f5f5f5;
     padding: 20px 32px;
   }
+
   ::v-deep .u-form {
     width: 100%;
     .areaIds {
@@ -186,7 +188,8 @@ export default {
       }
     }
   }
-  .datas {
+
+  .dataes {
     .datass {
       display: flex;
       padding: 24px 32px;
@@ -215,5 +218,10 @@ export default {
       }
     }
   }
+
+  .emptyWrap {
+    background: #f5f5f5;
+    margin: 0;
+  }
 }
 </style>

From 4d4fac1cc5acfbdef98b126de0d600c89a53eee6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 14:41:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/SelectGird.vue | 3 ++-
 src/apps/AppGridManagement/SelectUser.vue | 3 ++-
 src/apps/AppGridManagement/SetGird.vue    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppGridManagement/SelectGird.vue b/src/apps/AppGridManagement/SelectGird.vue
index f984c2b8..2841e1d9 100644
--- a/src/apps/AppGridManagement/SelectGird.vue
+++ b/src/apps/AppGridManagement/SelectGird.vue
@@ -24,7 +24,7 @@
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
       </div>
     </div>
-    <div style="padding-bottom: 70px;background:#f5f5f5;"></div>
+    <!-- <div style="padding-bottom: 70px;"></div> -->
     <div class="subBtn" @click="submit">
       <div>确定选择</div>
     </div>
@@ -156,6 +156,7 @@ export default {
 .SelectGird {
   height: 100%;
   background: #fff;
+  padding-bottom: 140px;
   .header-top {
     background: #fff;
     padding: 20px 32px;
diff --git a/src/apps/AppGridManagement/SelectUser.vue b/src/apps/AppGridManagement/SelectUser.vue
index 12665f4b..d4ec421a 100644
--- a/src/apps/AppGridManagement/SelectUser.vue
+++ b/src/apps/AppGridManagement/SelectUser.vue
@@ -25,7 +25,7 @@
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
       </div>
     </div>
-    <div style="padding-bottom: 70px;background:#f5f5f5;"></div>
+    <!-- <div style="padding-bottom: 70px;background:#fff;"></div> -->
     <div class="subBtn" @click="submit">
       <div>确定选择</div>
     </div>
@@ -103,6 +103,7 @@ export default {
 <style scoped lang="scss">
 .SelectUser {
   height: 100%;
+  padding-bottom: 140px;
   background: #fff;
   .header-top {
     background: #fff;
diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue
index 877d82f6..03efdffa 100644
--- a/src/apps/AppGridManagement/SetGird.vue
+++ b/src/apps/AppGridManagement/SetGird.vue
@@ -25,7 +25,7 @@
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
       </div>
     </div>
-    <div style="padding-bottom: 70px;background:#f5f5f5;"></div>
+    <!-- <div style="padding-bottom: 70px;"></div> -->
     <div class="subBtn" @click="toAddGird">
       <div>添加网格</div>
     </div>
@@ -223,6 +223,7 @@ export default {
 .setGird {
   height: 100%;
   background: #fff;
+  padding-bottom: 140px;
   .header-top {
     background: #fff;
     padding: 20px 32px;