From bb30ee02b7ebada44be8cb5730b905c27d1683f6 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 17 Apr 2024 13:55:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resiAndHouse/resiAndHouse.js   | 8 +++++++-
 pages/resiAndHouse/resiAndHouse.wxml | 7 +++++--
 pages/resiAndHouse/resiAndHouse.wxss | 8 +++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index b2f558d..1df26ae 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -504,6 +504,11 @@ Page({
         }
 
     },
+    toAddResi(){
+        wx.navigateTo({
+            url: `/subpages/addResi/pages/addResi/addResi`,
+        })
+    },
     getTableFwData: async function () {
         this.setData({
             loadFwMoreVisible: true,
@@ -526,6 +531,7 @@ Page({
                 fwTypes: arr
             })
         })
+     
         await houseSearch({ ...this.data.params1, searchKey: this.data.keyWord }).then(res => {
             const { code, data } = res;
             if (code == 0) {
@@ -535,7 +541,7 @@ Page({
                 })
                 if (this.data.tableFwData.length == 0) {
                     this.setData({
-                        loadFwMoreVisible: false,
+                        loadFwMoreVisible: true,
                         loadFwMoreType: 'none',
                         nodatafw: true
                     })
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index 33569e3..f9fb350 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -84,11 +84,14 @@
                     <text lines="1" class="text_31">{{item.agencyName || ''}} {{item.homeName || ''}}</text>
                 </view>
             </view>
-            <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}"></load-more>
-            <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
+            <!-- <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}"></load-more> -->
+            <!-- <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data> -->
+            <view  class="loadVisible">{{loadMoreType == 'more'?'加载中...':'如果找不到该居民的信息，您也可以先'}}<text wx:if="{{loadMoreType == 'none'}}" style="color: #3A80E7;" bind:tap="toAddResi">新增居民</text></view>
         </scroll-view>
     </view>
+
 </view>
+
 <view class="group_2" wx:if="{{selectVale === 'house'}}">
     <view class="section_2">
         <view class="box_16">
diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss
index 98f261a..b629e9d 100644
--- a/pages/resiAndHouse/resiAndHouse.wxss
+++ b/pages/resiAndHouse/resiAndHouse.wxss
@@ -1395,7 +1395,13 @@ page {
 .scroll_fw {
     height: calc(100vh - 750rpx);
 }
-
+.loadVisible{
+    color: #c1c1c1;
+    font-size: 24rpx;
+    width: 100%;
+    text-align: center;
+    margin-top: 20rpx;
+}
 .form_item_fw {
     width: 100%;
     display: flex;