From 9aec9023ac226f72c944215a6a8bcf0227f0dd7d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 16:15:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=81=AE=E6=8C=A1=E6=88=B7=E4=B8=BB=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/AddFamily.vue  | 1 +
 src/apps/AppGridManagement/FamilyList.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue
index c24d2767..62a8c460 100644
--- a/src/apps/AppGridManagement/AddFamily.vue
+++ b/src/apps/AppGridManagement/AddFamily.vue
@@ -142,6 +142,7 @@ export default {
   .userList {
     width: 100%;
     background-color: #FFFFFF ;
+    padding-bottom: 120px;
      ul {
        padding-left: 0px;
       li {
diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index 1c0d8bfd..4f5df971 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -77,6 +77,7 @@ export default {
   }
   .main {
     background-color: #FFFFFF ;
+    padding-bottom: 112px;
     ul {
       padding: 0px 32px;
       background-color: #fff;

From da8d6a8bfaa5ca8bdb028c2128b3977750055cdb Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 16:18:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/Organization.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 8622b91c..c9c912b6 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -85,7 +85,6 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   padding-top: 32px;
-  background-color: #f3f6f9;
   .select-gird{
   width: calc(100% - 60px);
   padding: 24px 32px;

From 4c2d937a853e8e08d2d928cbf170d24fcbee8071 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 16:20:09 +0800
Subject: [PATCH 3/5] css

---
 src/apps/AppEpidemicSituation/Health.vue | 93 +++++++++++++-----------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/Health.vue b/src/apps/AppEpidemicSituation/Health.vue
index 5ceb6968..43616888 100644
--- a/src/apps/AppEpidemicSituation/Health.vue
+++ b/src/apps/AppEpidemicSituation/Health.vue
@@ -1,47 +1,49 @@
 <template>
   <div class="Health">
-    <div class="header">
-      <div class="tab-item">
-        <h2 style="color: #2c51ce">{{ userList.total }}</h2>
-        <p>上报人员</p>
-      </div>
-      <div class="tab-item">
-        <h2 style="color: #5aad6a">{{ userList.today }}</h2>
-        <p>今日上报</p>
-      </div>
-      <div class="tab-item">
-        <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
-        <p>今日未报</p>
-      </div>
-      <div class="tab-item">
-        <h2 style="color: #cd413a; border-right: 0">{{ userList.unusual }}</h2>
-        <p>今日异常</p>
-      </div>
-    </div>
-
-    <div class="line1"></div>
-
-    <div class="middle">
-      <div class="left">
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666">
-          <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
-          <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-          <span v-else>请选择</span>
-          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
-        </AiAreaPicker>
+    <AiTopFixed>
+      <div class="header">
+        <div class="tab-item">
+          <h2 style="color: #2c51ce">{{ userList.total }}</h2>
+          <p>上报人员</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #5aad6a">{{ userList.today }}</h2>
+          <p>今日上报</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
+          <p>今日未报</p>
+        </div>
+        <div class="tab-item">
+          <h2 style="color: #cd413a; border-right: 0">{{ userList.unusual }}</h2>
+          <p>今日异常</p>
+        </div>
       </div>
 
-      <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
-    </div>
+      <div class="line1"></div>
 
-    <div class="line2"></div>
+      <div class="middle">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666">
+            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
+            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
+          </AiAreaPicker>
+        </div>
+
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      </div>
+
+      <div class="line2"></div>
+
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#333" bar-width="192" active-color="#135AB8 " @change="change"></u-tabs>
+    </AiTopFixed>
 
     <div class="bottoms">
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#333" bar-width="192" active-color="#135AB8 " @change="change"></u-tabs>
-
-      <div class="line3"></div>
-
       <template v-if="data.length">
+        <div class="line3"></div>
+
         <div class="templates" v-for="(item, i) in data" :key="i" @click="goDetail(item)">
           <img :src="item.avatar" alt="" v-if="item.avatar" />
           <img src="./components/img/user-img.png" alt="" v-else />
@@ -196,6 +198,19 @@ export default {
 .Health {
   height: 100%;
   background: #fff;
+  ::v-deep .AiTopFixed {
+    .placeholder {
+      .content {
+        padding: 0 !important;
+      }
+    }
+    .fixed {
+      margin: 0 !important;
+      .content {
+        padding: 0 !important;
+      }
+    }
+  }
 
   .header {
     padding: 54px 32px 48px 32px;
@@ -256,12 +271,8 @@ export default {
   }
 
   .bottoms {
-    .u-tabs {
-      margin-bottom: -8px;
-    }
-
     .line3 {
-      height: 4px;
+      height: 6px;
       background: #f3f6f9;
     }
 

From b556585e95950db169ae51fddb51bf77d5986746 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 14 Jan 2022 16:22:44 +0800
Subject: [PATCH 4/5] 26640

---
 src/apps/AppEpidemicSituation/UserDetail.vue | 1 +
 src/apps/AppEpidemicSituation/UserInfo.vue   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue
index a9e6e8ef..5955cd83 100644
--- a/src/apps/AppEpidemicSituation/UserDetail.vue
+++ b/src/apps/AppEpidemicSituation/UserDetail.vue
@@ -162,6 +162,7 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.data = res.data
+            this.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
             this.$hideLoading()
           } else {
             this.$hideLoading()
diff --git a/src/apps/AppEpidemicSituation/UserInfo.vue b/src/apps/AppEpidemicSituation/UserInfo.vue
index 4f1f1144..8d859595 100644
--- a/src/apps/AppEpidemicSituation/UserInfo.vue
+++ b/src/apps/AppEpidemicSituation/UserInfo.vue
@@ -170,6 +170,7 @@ export default {
           this.info = res.data
           this.info.checkPhoto = JSON.parse(this.info.checkPhoto)
           this.info.health = this.info.health.split(',')
+          this.info.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
         }
       })
     },

From bce92175cdb12edcbbc9ebffac70dc8c3933b966 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 16:23:53 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=A9=BA=E7=8A=B6=E6=80=81=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index 4f5df971..34a399f3 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="FamilyList">
     <div class="title">户主列表</div>
-    <div class="main">
+    <div class="main" v-if="list.length">
       <ul v-for="item in list" :key="item.id">
         <li>
           <div class="user">
@@ -68,7 +68,6 @@ export default {
 
 <style lang="scss" scoped>
 .FamilyList {
-  background-color: #FFFFFF;
   .title {
     padding: 24px 32px;
     background-color: #F3F6F9;