From 31cc7720560d5f38f89fed0c7e625c9793afa241 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 16 Apr 2024 13:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=9B=BE=E8=B0=B1=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B1=85=E6=B0=91,=E4=BA=BA=E6=88=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resiAndHouse/resiAndHouse.wxml                        | 2 +-
 pages/resiAndHouse/resiAndHouse.wxss                        | 5 +++--
 subpages/house/pages/housePortrait/component/graph/graph.js | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index cd82e9f..7190b05 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -51,7 +51,7 @@
         <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
             <view class="form_item" wx:for="{{tableData}}" :wx:key="{{index}}" bind:tap="toResiDetail" data-resiId="{{item.resiId}}">
                 <view class="box_18">
-                   <view style="display: flex;align-items: center;">
+                   <view style="display: flex;align-items: center;max-width: 400rpx;">
                     <view style="display: flex;">
                         <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&&item.age>18 &&item.age<60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png" mode="" />
                         <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&& item.age<18 }}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/62c2b6a1ce834f8dae081b562b2579b9.png" mode="" />
diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss
index 410fb18..633cf7f 100644
--- a/pages/resiAndHouse/resiAndHouse.wxss
+++ b/pages/resiAndHouse/resiAndHouse.wxss
@@ -458,7 +458,7 @@ page {
 }
 
 .box_18 {
-    width: 649rpx;
+    width: 100%;
     /* height: 36rpx; */
     flex-direction: row;
     align-items: center;
@@ -1383,9 +1383,10 @@ page {
 
 .resi_tag {
     display: flex;
-    flex-grow: 0;
+    /* flex-grow: 0; */
     /* justify-content: start; */
     /* max-width: 302rpx; */
+    flex: 1;
     overflow-x: scroll;
     padding: 10rpx 0 0;
     box-sizing: border-box;
diff --git a/subpages/house/pages/housePortrait/component/graph/graph.js b/subpages/house/pages/housePortrait/component/graph/graph.js
index 055c8e1..f8475da 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.js
+++ b/subpages/house/pages/housePortrait/component/graph/graph.js
@@ -9,6 +9,9 @@ Component({
         houseId: {
             type: String,
             value: '',
+            observer(val) {
+                this.getData()
+            }
         },
         houseName:{
             type: String,