From 08d352abd078afdbbe794a0afdb335c521a27d85 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 3 Apr 2024 15:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8F=90=E4=BA=A4,=E4=BA=BA?=
 =?UTF-8?q?=E6=88=BF=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/cardIcon.png                | Bin 0 -> 1866 bytes
 pages/resiAndHouse/resiAndHouse.js |  24 +++++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 images/cardIcon.png

diff --git a/images/cardIcon.png b/images/cardIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e3a4f67b7c89ba5640e4de5f50821c75f8638b0
GIT binary patch
literal 1866
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
Ef?JM|lK=n!

literal 0
HcmV?d00001

diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index f0b0879..595fdd0 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -34,13 +34,13 @@ Page({
         pageNo: 1,
         pageSize: 10,
         lowerThreshold: '10',
-        loadMoreVisible: false,
+        loadMoreVisible: true,
         loadFwMoreVisible: false,
         loadMoreType: "none",
         loadFwMoreType: "none",
         nodata: false,
         selectVale: 'resi',
-        keyWord: '1',
+        keyWord: '',
         angencyId: null,
         category: null,
         searchOrgIdPath: '',
@@ -101,7 +101,7 @@ Page({
                 searchOrgIdPath:App.globalData.user.agencyId,
             }
         })
-        this.getTableFwData()
+        // this.getTableFwData()
         this.getAgencygridtree()
         this.getAllOrgCategoryCount()
         this.getTableData()
@@ -281,6 +281,20 @@ Page({
         this.setData({
             selectVale: e.currentTarget.dataset.type
         })
+        if(e.currentTarget.dataset.type === 'resi'){
+            this.setData({
+                pageNo: 1,
+                tableData: []
+            })
+            this.getTableData()
+            this.getAllOrgCategoryCount()
+        }else if(e.currentTarget.dataset.type === 'house'){
+            this.setData({
+                pageNo: 1,
+                tableFwData: []
+            })
+            this.getTableFwData()
+        }
     },
     handelClickShowTree() {
         this.setData({
@@ -310,6 +324,7 @@ Page({
                 tableData: []
             })
             this.getTableData()
+            this.getAllOrgCategoryCount()
         }else{
             this.setData({
                 pageNo: 1,
@@ -356,7 +371,7 @@ Page({
         // '1765976717767618562'
         console.log(e);
         wx.navigateTo({
-            url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${e.currentTarget.dataset.resiid}`,
+            url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.resiid}`,
         })
     },
     onClickJump(e) {
@@ -382,7 +397,6 @@ Page({
     },
 
     onScrollToLower(e) {
-
         if (this.data.loadMoreType === 'more') {
             this.setData({
                 loadMoreVisible: true,