From a1c3b5080de2f2f8d06280382397e5fc1af4e091 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 18 Jul 2024 15:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E5=88=AB=E7=9A=84=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E9=97=A8=E7=89=8C=E5=8F=B7=E5=BC=B9=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/housePortrait/housePortrait.js      | 29 +++++++++----------
 .../pages/housePortrait/housePortrait.wxml    |  4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/subpages/house/pages/housePortrait/housePortrait.js b/subpages/house/pages/housePortrait/housePortrait.js
index 29933e5..ec6a903 100644
--- a/subpages/house/pages/housePortrait/housePortrait.js
+++ b/subpages/house/pages/housePortrait/housePortrait.js
@@ -30,25 +30,24 @@ Page({
             this.setData({
                 detail: res.data,
                 houseName: res.data.houseName
-            })
-        }).catch((error) => {
-        });
-        api.houseResidentChangeRecord({ houseId: this.data.houseId }).then((res) => {
+            });
+            return api.houseResidentChangeRecord({ houseId: this.data.houseId });
+        }).then((res) => {
             this.setData({
                 logs: res.data
-            })
-        }).catch((error) => {
-            console.error("发生错误:", error);
-        });
-        api.getResiList({ homeId: this.data.houseId, pageNo: 1, pageSize: 1000 }).then(res => {
-            const arr = res.data.list.map(item => {
-                return item.resiId
-            })
+            });
+            return api.getResiList({ homeId: this.data.houseId, pageNo: 1, pageSize: 1000 });
+        }).then((res) => {
+            const arr = res.data.list.map(item => item.resiId);
             this.setData({
                 residIds: arr,
-            })
-            this.getTabData()
-        })
+            });
+            this.getTabData();
+        }).catch((error) => {
+            this.setData({
+                detail: null,
+            });
+        });
     },
     handelClickAddResi(){
         wx.navigateTo({
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 9feace6..2080854 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -24,13 +24,13 @@
 
     <view class="card">
         <view class="title">
-            <text>关系图谱</text>
+            <text>关系图谱 </text>
             <view class="view" bind:tap="handelClickAddResi">
                 新增居民
                 <image mode="widthFix" src="../../../../images/right.png"></image>
             </view>
         </view>
-    <house-graph houseId="{{houseId}}" bind:clickGraphNode="clickGraphNode" ></house-graph>
+    <house-graph wx:if="{{detail}}" houseId="{{houseId}}" bind:clickGraphNode="clickGraphNode" ></house-graph>
     </view>
 
     <view class="card">