From 27da7731ba32d08bd0d7d1e4d8d628c88858adcd Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 8 Aug 2022 09:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppResidentDocument.vue                   | 21 ++++-
 .../saas/AppResidentDocument/DetailCard.vue   | 81 +++++++++--------
 .../saas/AppResidentDocument/DetailPeople.vue | 89 ++++++++-----------
 3 files changed, 92 insertions(+), 99 deletions(-)

diff --git a/src/project/saas/AppResidentDocument/AppResidentDocument.vue b/src/project/saas/AppResidentDocument/AppResidentDocument.vue
index 3f925b18..65ebf8a8 100644
--- a/src/project/saas/AppResidentDocument/AppResidentDocument.vue
+++ b/src/project/saas/AppResidentDocument/AppResidentDocument.vue
@@ -2,8 +2,18 @@
   <div class="AppResidentDocument">
     <u-tabs class="tabs" :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change" :bar-width="196"></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>
+      <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="dataes" v-if="datas.length">
       <div class="datass" v-for="(item, index) in datas" :key="index" @click="toDetailCard(item)">
@@ -26,7 +36,6 @@
         </div>
       </div>
     </div>
-    <!-- <AiEmpty class="emptyWrap" v-else :noPermit="true" description="暂无居民<br/>信息点击按钮新增居民信息,也可在管理系统批量导入"></AiEmpty> -->
     <div class="empty" v-if="!datas.length && isMore">
       <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
       <p>暂无居民信息<br/>点击<span @click="edit('')">新增按钮</span>新增居民信息,也可在管理系统批量导入</p>
@@ -165,7 +174,7 @@ export default {
 <style scoped lang="scss">
 .AppResidentDocument {
   height: 100%;
-  padding-top: 80rpx;
+  padding-top: 96rpx;
 
   .tabs {
     position: fixed;
@@ -235,6 +244,10 @@ export default {
       height: 128rpx;
       padding: 0 0 0 32px;
 
+      &:active {
+        background: #eee;
+      }
+
       .left {
         img {
           width: 80px;
diff --git a/src/project/saas/AppResidentDocument/DetailCard.vue b/src/project/saas/AppResidentDocument/DetailCard.vue
index 21e95cb2..83048036 100644
--- a/src/project/saas/AppResidentDocument/DetailCard.vue
+++ b/src/project/saas/AppResidentDocument/DetailCard.vue
@@ -1,17 +1,14 @@
 <template>
-  <div class="DetailCard">
+  <div class="DetailCard" v-if="pageShow">
     <div class="top"></div>
-
     <div class="middle">
       <div class="hint">家庭地址</div>
-
       <div class="areaHint">
         <u-icon name="map-fill" color="#73ABFF"></u-icon>
         <span style="margin-left: 14px;">{{resident.currentAreaName}}</span>
         <span v-if="resident.currentAddress">{{resident.currentAddress}}</span>
       </div>
     </div>
-
     <div class="bottom">
       <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
 
@@ -52,46 +49,48 @@
 </template>
 
 <script>
-export default {
-  name: 'DetailCard',
-  components: {},
-  props: {},
-  data() {
-    return {
-      id: '',
-      data: [],
-      resident: {},
-    }
-  },
-  computed: {},
-  watch: {},
-  onLoad(o) {
-    document.title = '居民信息'
-    this.id = o.id
-    this.$dict.load('householdRelation', 'fileStatus').then(() => {
-      this.getDetail()
-    })
-  },
-  onShow() {},
-  methods: {
-    getDetail() {
-      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.data = res.data
-          this.$forceUpdate()
-          this.$nextTick(() => {
-            this.resident = res.data.resident
-            this.$forceUpdate()
-          })
-        }
+  export default {
+    name: 'DetailCard',
+
+    data() {
+      return {
+        id: '',
+        data: [],
+        pageShow: false,
+        resident: {},
+      }
+    },
+
+    onLoad(o) {
+      document.title = '居民信息'
+      this.id = o.id
+      this.$dict.load('householdRelation', 'fileStatus').then(() => {
+        this.getDetail()
       })
     },
 
-    toDetailPeople(item) {
-      uni.navigateTo({ url: `./DetailPeople?id=${item.id}` })
-    },
-  },
-}
+    methods: {
+      getDetail() {
+        this.$loading()
+        this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+          if (res.code == 0) {
+            this.data = res.data
+            this.$forceUpdate()
+            this.$nextTick(() => {
+              this.resident = res.data.resident
+              this.$forceUpdate()
+            })
+
+            this.pageShow = true
+          }
+        })
+      },
+
+      toDetailPeople(item) {
+        uni.navigateTo({ url: `./DetailPeople?id=${item.id}` })
+      }
+    }
+  }
 </script>
 
 <style scoped lang="scss">
diff --git a/src/project/saas/AppResidentDocument/DetailPeople.vue b/src/project/saas/AppResidentDocument/DetailPeople.vue
index edeaf906..b2e2b2a0 100644
--- a/src/project/saas/AppResidentDocument/DetailPeople.vue
+++ b/src/project/saas/AppResidentDocument/DetailPeople.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="DetailPeople">
+  <div class="DetailPeople" v-if="pageShow">
     <div class="top">
       <div class="photos">
         <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
@@ -18,86 +18,68 @@
         <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
       </div>
     </div>
-
     <div class="line"></div>
-
     <div class="middle">
       <div class="hint">个人基本信息</div>
-
       <div class="contents">
         <div class="item">
           <span>籍贯</span>
           <span>{{ data.resident && data.resident.birthplaceAreaName }}</span>
         </div>
-
         <div class="item">
           <span>身份证号</span>
           <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
         </div>
-
         <div class="item">
           <span>民族</span>
           <span v-if="data.resident && data.resident.nation"> {{ $dict.getLabel('nation', data.resident.nation) }}</span>
         </div>
-
         <div class="item">
           <span>文化程度</span>
           <span v-if="data.resident && data.resident.education">{{ $dict.getLabel('education', data.resident.education) }}</span>
         </div>
-
         <div class="item">
           <span>婚姻状况</span>
           <span v-if="data.resident && data.resident.maritalStatus">{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
         </div>
-
         <div class="item">
           <span>政治面貌</span>
           <span v-if="data.resident && data.resident.politicsStatus">{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
         </div>
-
         <div class="item">
           <span>兵役状况</span>
           <span v-if="data.resident && data.resident.militaryStatus">{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
         </div>
-
         <div class="item">
           <span>宗教信仰</span>
           <span v-if="data.resident && data.resident.faithType">{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
         </div>
-
         <div class="item">
           <span>职业</span>
           <span v-if="data.resident && data.resident.job">{{ $dict.getLabel('job', data.resident.job) }}</span>
         </div>
       </div>
     </div>
-
     <div class="lines"></div>
-
     <div class="bottom">
       <div class="hint">联络信息</div>
-
       <div class="contents">
         <div class="item">
           <span>联系方式</span>
           <span class="phones" v-if="data.resident && data.resident.phone" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
         </div>
-
         <div class="item">
           <span>现住址</span>
           <span v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
         </div>
-
         <div class="item">
           <span>现住详细地址</span>
           <span v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
         </div>
-
         <div class="item">
           <span>户籍地址</span>
           <span v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
         </div>
-
         <div class="item">
           <span>户籍详细地址</span>
           <span v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
@@ -108,43 +90,42 @@
 </template>
 
 <script>
-export default {
-  name: 'DetailPeople',
-  components: {},
-  props: {},
-  data() {
-    return {
-      id: '',
-      data: [],
-    }
-  },
-  computed: {},
-  watch: {},
-  onLoad(o) {
-    this.id = o.id
-    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
-      this.getDetail()
-    })
-  },
-  onShow() {
-    document.title = '家庭成员信息'
-  },
-  methods: {
-    getDetail() {
-      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.data = res.data
-          // this.$nextTick(() => {
-          //   this.currentAreaName = res.data.resident.currentAreaName
-          // })
-        }
+  export default {
+    name: 'DetailPeople',
+
+    appName: '家庭成员信息',
+
+    data() {
+      return {
+        id: '',
+        data: [],
+        pageShow: false
+      }
+    },
+
+    onLoad(o) {
+      this.id = o.id
+      this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
+        this.getDetail()
       })
     },
-    callPhone(phone) {
-      uni.makePhoneCall({ phoneNumber: phone })
-    },
-  },
-}
+
+    methods: {
+      getDetail() {
+        this.$loading()
+        this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+          if (res.code == 0) {
+            this.data = res.data
+            this.pageShow = true
+          }
+        })
+      },
+
+      callPhone(phone) {
+        uni.makePhoneCall({ phoneNumber: phone })
+      }
+    }
+  }
 </script>
 
 <style scoped lang="scss">