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 @@ {{item.agencyName || ''}} {{item.homeName || ''}} - - + + + {{loadMoreType == 'more'?'加载中...':'如果找不到该居民的信息,您也可以先'}}新增居民 + + 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;