diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 4bc9a0b..4e4f6c6 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -51,13 +51,13 @@ --> - + diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index d79305b..a43ef5e 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -72,7 +72,7 @@ Page({ "searchKey": "", "pageSize": 50, "pageNo": 1, - "searchOrgIdPath": "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", + "searchOrgIdPath": "", }, activeFwType: 0, fwTypes: [ @@ -99,7 +99,7 @@ Page({ }, params1: { ...this.data.params1, - searchOrgIdPath:App.globalData.user.agencyId, + // searchOrgIdPath:App.globalData.user.agencyId, } }) this.getAgencygridtree() @@ -264,15 +264,17 @@ Page({ params: { ...this.data.params, orgId: value, - level, + level:level == 'grid'?'grid':'agency', + agencyId:App.globalData.user.agencyId }, params1: { pageNo: 1, ...this.data.params1, searchOrgIdPath: value, - orgId: value, + // orgId: value, level, }, + tableFwData:[] }); this.getTableFwData() }, diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index e217444..0f7de26 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -15,10 +15,10 @@ - + - + 搜索 diff --git a/subpages/house/pages/housePortrait/housePortrait.json b/subpages/house/pages/housePortrait/housePortrait.json index 6a8473f..d67c763 100644 --- a/subpages/house/pages/housePortrait/housePortrait.json +++ b/subpages/house/pages/housePortrait/housePortrait.json @@ -2,6 +2,8 @@ "navigationBarTitleText": "房屋详情", "usingComponents": { "BusinessRecord": "../../../businessRecord/businessRecord", - "no-data": "../../../../components/noData/nodata" + "no-data": "../../../../components/noData/nodata", + "resi-graph":"./component/graph/graph" + } } \ No newline at end of file diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml index 3bb2204..730bfc2 100644 --- a/subpages/house/pages/housePortrait/housePortrait.wxml +++ b/subpages/house/pages/housePortrait/housePortrait.wxml @@ -22,7 +22,7 @@ - + diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js index 6dd2576..da6b480 100644 --- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js +++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js @@ -81,6 +81,8 @@ Component({ item.age > 60 ? 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/2465ff7633a94413bf4ed2aa778c2765.png' : ''; + }else{ + symbolUrl = 'image://https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png' } } return {