From 6ddbc2eafa964a2c4e2d68e32a7777430b4d3632 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 9 Aug 2022 15:33:57 +0800
Subject: [PATCH] 1

---
 .../saas/AppResidentDocument/DetailCard.vue   |  5 ++--
 .../saas/AppResidentDocument/DetailPeople.vue | 29 +++++--------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/project/saas/AppResidentDocument/DetailCard.vue b/src/project/saas/AppResidentDocument/DetailCard.vue
index 4cbc3b09..359b3e76 100644
--- a/src/project/saas/AppResidentDocument/DetailCard.vue
+++ b/src/project/saas/AppResidentDocument/DetailCard.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="DetailCard" v-if="pageShow">
     <div class="top">
-      <image src="./components/img/4.png" />
+      <image v-if="resident.photo" :src="resident.photo" />
+      <image v-else src="./components/img/4.png" />
       <div class="top-right">
         <div class="top-right__top">
           <div class="left">
-            <h2>卓作旺</h2>
+            <h2>{{ resident.name }}</h2>
             <i>已注销</i>
           </div>
           <span>户主</span>
diff --git a/src/project/saas/AppResidentDocument/DetailPeople.vue b/src/project/saas/AppResidentDocument/DetailPeople.vue
index 6724f8c3..94dae72c 100644
--- a/src/project/saas/AppResidentDocument/DetailPeople.vue
+++ b/src/project/saas/AppResidentDocument/DetailPeople.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="DetailPeople" v-if="pageShow">
     <div class="top">
-      <image src="./components/img/4.png" />
+      <image v-if="resident.photo" :src="resident.photo" />
+      <image v-else src="./components/img/4.png" />
       <div class="top-right">
         <div class="top-right__top">
           <div class="left">
-            <h2>卓作旺</h2>
+            <h2>{{ resident.name }}</h2>
             <i>已注销</i>
           </div>
           <span>户主</span>
@@ -21,24 +22,6 @@
         </div>
       </div>
     </div>
-    <!-- <div class="top">
-      <div class="photos">
-        <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
-        <img src="./components/img/44.png" alt="" v-else />
-      </div>
-
-      <div class="right">
-        <div class="rightTop">
-          <span class="names">{{ data.resident && data.resident.name }}<span class="fileStatuss" v-if="data.resident.fileStatus == 1">已注销</span></span>
-          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
-          <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
-          </span>
-        </div>
-
-        <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>
@@ -120,22 +103,24 @@
       return {
         id: '',
         data: [],
+        resident: {},
         pageShow: false
       }
     },
 
-    onLoad(o) {
+    onLoad (o) {
       this.id = o.id
       this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
+        this.$loading()
         this.getDetail()
       })
     },
 
     methods: {
       getDetail() {
-        this.$loading()
         this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
           if (res.code == 0) {
+            this.resident = res.data.resident
             this.data = res.data
             this.pageShow = true
           }