diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index 0b87901..1b811f9 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -80,7 +80,14 @@ Page({ { name: '未出售', num: 0, value: '3' }, ], tempList:[], - angencyJmList:[] + angencyJmList:[], + houseListSearchFlag:false + }, + handelClickedit(e){ + console.log(e); + wx.navigateTo({ + url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.item.id}`, + }) }, /** * 生命周期函数--监听页面加载 @@ -409,6 +416,16 @@ Page({ this.getTableData() this.getAllOrgCategoryCount() }else{ + if(this.data.keyWord){ + this.setData({ + houseListSearchFlag:true, + 'params1.searchOrgIdPath':App.globalData.user.agencyId + }) + }else{ + this.setData({ + houseListSearchFlag:false + }) + } this.setData({ pageNo: 1, tableFwData: [] diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index 80aeac1..cbb964b 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -94,7 +94,7 @@ - + {{cascaderNameFw}} @@ -103,7 +103,7 @@ - + {{item.num}} @@ -111,7 +111,7 @@ - + 注: 自住 @@ -122,8 +122,8 @@ 未出售 - - + + @@ -141,7 +141,17 @@ - + + + + {{item.quartersName+item.buildingName+item.buildingUnitName + item.houseName}} + + + + + + + diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index b629e9d..951e54d 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -1395,6 +1395,9 @@ page { .scroll_fw { height: calc(100vh - 750rpx); } +.scroll_fw_search{ + height: calc(100vh - 460rpx); +} .loadVisible{ color: #c1c1c1; font-size: 24rpx; @@ -1553,4 +1556,48 @@ page { .huang{ color: #fcac00; background-color: #fff3db; +} +.card{ + background-color: #fff; + border-radius: 0 0 20rpx 20rpx; + padding: 0 30rpx; + box-sizing: border-box; +} +.card .list_card{ + display: flex; + justify-content: space-around; + padding: 30rpx 0; + align-items: center; + color: #333333; + border-top: 1px solid #EAEAEA; +} +.card .list_card .left{ + flex: 1; + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.card .list_card .left :nth-child(1), +.card .list_card .left :nth-child(2){ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.card .list_card .left .address{ + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; + margin-top: 20rpx; +} +.list_card .right image{ + width: 20rpx; + height: 20rpx; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 7f69793..adf3f3d 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,6 +9,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "房屋搜索", + "pathName": "subpages/searchResult/pages/searchResult/searchResult", + "query": "type=house&keyword=101", + "launchMode": "default", + "scene": null + }, { "name": "巡查上报", "pathName": "subpages/InspectionReport/pages/InspectionReport/InspectionReport", @@ -272,18 +279,6 @@ "pathName": "subpages/gatherInformation/pages/gatherInformation/gatherInformation", "query": "", "scene": null - }, - { - "name": "", - "pathName": "subpages/searchResult/pages/ceshi/ceshi", - "query": "resiId=1704759138283409410", - "scene": null - }, - { - "name": "", - "pathName": "subpages/searchResult/pages/cheshi/cheshi", - "query": "resiId=1704759138283409410", - "scene": null } ] }