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

src/apps/AppEpidemicSituation/Health.vue

@@ -1,47 +1,49 @@
 <template>
   <div class="Health">
-    <div class="header">
+    <AiTopFixed>
-      <div class="tab-item">
+      <div class="header">
-        <h2 style="color: #2c51ce">{{ userList.total }}</h2>
+        <div class="tab-item">
-        <p>上报人员</p>
+          <h2 style="color: #2c51ce">{{ userList.total }}</h2>
-      </div>
+          <p>上报人员</p>
-      <div class="tab-item">
+        </div>
-        <h2 style="color: #5aad6a">{{ userList.today }}</h2>
+        <div class="tab-item">
-        <p>今日上报</p>
+          <h2 style="color: #5aad6a">{{ userList.today }}</h2>
-      </div>
+          <p>今日上报</p>
-      <div class="tab-item">
+        </div>
-        <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
+        <div class="tab-item">
-        <p>今日未报</p>
+          <h2 style="color: #f5a319">{{ userList.unReport }}</h2>
-      </div>
+          <p>今日未报</p>
-      <div class="tab-item">
+        </div>
-        <h2 style="color: #cd413a; border-right: 0">{{ userList.unusual }}</h2>
+        <div class="tab-item">
-        <p>今日异常</p>
+          <h2 style="color: #cd413a; border-right: 0">{{ userList.unusual }}</h2>
-      </div>
+          <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>
       </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 class="line1"></div>
-    </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;
     }
 

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()

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")
         }
       })
     },

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 {

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;
@@ -77,6 +76,7 @@ export default {
   }
   .main {
     background-color: #FFFFFF ;
+    padding-bottom: 112px;
     ul {
       padding: 0px 32px;
       background-color: #fff;

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;