From 81dd979440479dc3c50a0957d4cbc11bba86b34e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 17 Mar 2022 17:02:10 +0800
Subject: [PATCH] BUG 28296

---
 src/apps/AppPeopleList/AppPeopleList.vue |   6 +-
 src/apps/AppPeopleList/PeopleList.vue    | 115 +++++++++++++----------
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/src/apps/AppPeopleList/AppPeopleList.vue b/src/apps/AppPeopleList/AppPeopleList.vue
index a8264fe4..1d6b963c 100644
--- a/src/apps/AppPeopleList/AppPeopleList.vue
+++ b/src/apps/AppPeopleList/AppPeopleList.vue
@@ -39,10 +39,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-uni-page-body {
-  height: 100%!important;
-  background-color: #fff!important;
-}
 .AppPeopleList{
   height: 100%;
   padding-top: 16px;
@@ -65,4 +61,4 @@ uni-page-body {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppPeopleList/PeopleList.vue b/src/apps/AppPeopleList/PeopleList.vue
index 80cb269d..7adb23c7 100644
--- a/src/apps/AppPeopleList/PeopleList.vue
+++ b/src/apps/AppPeopleList/PeopleList.vue
@@ -1,30 +1,34 @@
 <template>
   <div class="PeopleList">
-    <div class="areatop">
-      <!-- <div>区域选择</div>
-      <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
-      <u-icon name="photo"></u-icon> -->
-      <!-- @select="areaSelect" -->
-      <u-form label-width="auto">
-        <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
-          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj" :name.sync="areaName"></AiAreaPicker>
-        </u-form-item>
-      </u-form>
-    </div>
+    <AiTopFixed>
+      <div class="areatop">
+        <!-- <div>区域选择</div>
+        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+        <u-icon name="photo"></u-icon> -->
+        <!-- @select="areaSelect" -->
+        <u-form label-width="auto">
+          <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
+            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"
+                          :name.sync="areaName"></AiAreaPicker>
+          </u-form-item>
+        </u-form>
+      </div>
 
-    <div class="line"></div>
+      <div class="line"></div>
 
-    <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
-
-    <div class="seachObjs">
-      <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>
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
 
+      <div class="seachObjs">
+        <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>
+    </AiTopFixed>
     <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" />
-          <img src="./components/img/4.png" alt="" v-else />
+          <img :src="item.photo" alt="" v-if="item.photo"/>
+          <img src="./components/img/4.png" alt="" v-else/>
         </div>
 
         <div class="right">
@@ -54,11 +58,10 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 
 export default {
   name: 'PeopleList',
-  components: {},
   props: {},
   data() {
     return {
@@ -89,7 +92,7 @@ export default {
   onLoad() {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
-    uni.$on('reload',()=>{
+    uni.$on('reload', () => {
       this.current = 1
       this.getList()
     })
@@ -102,23 +105,23 @@ export default {
     getList() {
       var residentType = ['', 0, 1][this.currentTabs]
       this.$http
-        .post('/app/appresident/list', null, {
-          params: {
-            size: 20,
-            current: this.current,
-            con: this.keyword,
-            areaId: this.areaId,
-            residentType: residentType,
-            auditStatus: 1
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+      .post('/app/appresident/list', null, {
+        params: {
+          size: 20,
+          current: this.current,
+          con: this.keyword,
+          areaId: this.areaId,
+          residentType: residentType,
+          auditStatus: 1
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
 
-            this.pages = res.data.pages
-          }
-        })
+          this.pages = res.data.pages
+        }
+      })
     },
 
     change(index) {
@@ -129,7 +132,7 @@ export default {
     },
 
     toDetailCard(item) {
-      uni.navigateTo({ url: `./DetailCard?id=${item.id}` })
+      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
     },
 
     seachObj(e) {
@@ -164,7 +167,8 @@ export default {
           }
           uni.hideLoading()
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     }
   },
   onReachBottom() {
@@ -175,11 +179,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-uni-page-body {
-  height: 100%;
-}
 .PeopleList {
   height: 100%;
+
   .areatop {
     display: flex;
     justify-content: space-between;
@@ -200,17 +202,20 @@ uni-page-body {
 
   ::v-deep .u-form {
     width: 100%;
+
     .areaIds {
       .u-form-item__body {
         .u-form-item--right {
           .u-form-item--right__content {
             display: flex;
             align-items: center;
+
             .u-form-item--right__content__slot {
               .AiAreaPicker {
                 width: 100%;
                 display: flex;
                 justify-content: flex-end;
+
                 .areaSelector {
                   .location {
                     opacity: 0;
@@ -218,6 +223,7 @@ uni-page-body {
                 }
               }
             }
+
             .u-form-item--right__content__icon {
               margin-bottom: 8px;
             }
@@ -229,9 +235,11 @@ uni-page-body {
 
   .dataes {
     background: #fff;
+
     .datass {
       display: flex;
       padding: 24px 32px;
+
       .left {
         img {
           width: 80px;
@@ -239,25 +247,29 @@ uni-page-body {
           border-radius: 50%;
         }
       }
+
       .right {
         display: flex;
         flex-direction: column;
         margin-left: 32px;
         width: 100%;
+
         .rightTop {
           font-size: 32px;
           font-weight: 500;
           color: #333333;
           display: flex;
           justify-content: space-between;
-          .btn{
-            img{
+
+          .btn {
+            img {
               width: 48px;
               height: 48px;
               margin-left: 40px;
             }
           }
         }
+
         .rightBottom {
           display: flex;
           justify-content: space-between;
@@ -271,6 +283,7 @@ uni-page-body {
     background: #f5f5f5;
     margin: 0;
   }
+
   .addBtn {
     width: 100%;
     height: 112px;
@@ -282,20 +295,24 @@ uni-page-body {
     position: fixed;
     bottom: 0;
   }
-  .empty{
+
+  .empty {
     height: 100%;
-    img{
+
+    img {
       width: 282px;
       height: 306px;
       margin: 168px 0 0 234px;
     }
-    p{
+
+    p {
       text-align: center;
       font-size: 28px;
       font-family: PingFangSC-Regular, PingFang SC;
       color: #999;
       line-height: 44px;
-      span{
+
+      span {
         color: #467DFE;
       }
     }