diff --git a/images/cardIcon.png b/images/cardIcon.png new file mode 100644 index 0000000..9e3a4f6 Binary files /dev/null and b/images/cardIcon.png differ 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,