From 9d2af8cd5bcec28527ab73313860248e48044283 Mon Sep 17 00:00:00 2001 From: luJianJun <2587063613@qq.com> Date: Wed, 9 Aug 2023 18:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=A0=E8=BD=BD=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20=20=20=E8=AF=A6=E6=83=85=E9=A1=B5=E6=B1=82=E6=88=BF?= =?UTF-8?q?=E6=BA=90=E5=A2=9E=E5=8A=A0=E6=95=B0=E7=BB=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biserialListItem/biserialListItem.vue | 6 +- src/components/selectTabBox/selectTabBox.vue | 6 + src/utils/axios.js | 2 +- src/views/detail.vue | 129 ++++++++++++------ 4 files changed, 97 insertions(+), 46 deletions(-) diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue index aa754d1..88e5971 100644 --- a/src/components/biserialListItem/biserialListItem.vue +++ b/src/components/biserialListItem/biserialListItem.vue @@ -43,7 +43,7 @@ }}
+ v-if="listData.data && listData.data.rentalduration && data && data.data.rentalduration&& pageType !== 2"> {{ data.data.rentalduration === '0' ? '租期不限' : listData.data.rentalduration[data.data && data.data.rentalduration] || '' @@ -81,10 +81,10 @@ && data.data.rent }}
{{ data && data.data && - data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }}
+ data.data.rent[0] }}~{{ data && data.data && data.data.rent[1] }} /{{ data && data.data && data.data.rentalperiod }} [ + v-show="data && data.data && data.data.rentalduration != 0 && pageType == 2">[ 租期{{ listData.data.rentalduration[data.data && data.data.rentalduration] }}] diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index 4f65a01..2666b7a 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -505,6 +505,7 @@ let setHireTypeArr = (type, id) => { let hireTypeObj = reactive({ id: '', title: '', hireId: '不限' })//出租方式所选 let setHireId = (item) => { + if (hireTypeObj.hireId != item.title) { hireTypeObj.id = '' hireTypeObj.title = '' @@ -513,12 +514,17 @@ let setHireId = (item) => { setSeachCondition('types', '') } hireTypeObj.hireId = item.title + if(!hireTypeObj.id){ + hireTypeObj.id = item.id + setLocation('types',hireTypeObj.id) + } } let dropdownCommand = (obj) => { hireTypeObj.id = obj.id hireTypeObj.title = obj.title // store.state.routeList['hireTypeObj'] = JSON.parse(JSON.stringify(hireTypeObj)) + console.log('obj',hireTypeObj) setSeachCondition('types', obj.id) } diff --git a/src/utils/axios.js b/src/utils/axios.js index 3288605..5384320 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -11,7 +11,7 @@ axios.defaults.withCredentials = true axios.interceptors.request.use( //响应拦截 async config => { - showFullScreenLoading() + if(config.url!='/tenement/pc/api/user/operation')showFullScreenLoading() // 开发时登录用的，可以直接替换小程序的 authorization // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3" if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg" diff --git a/src/views/detail.vue b/src/views/detail.vue index 4e76d5f..57ae191 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -25,15 +25,17 @@ housingInfo['data'].isintermediary == 1"> 预算 HK$ - {{ housingInfo['data'] && - housingInfo['data'].info.rent }} - + {{ + housingInfo['data'] && + housingInfo['data'].info.rent }} + {{ housingInfo['data'] && housingInfo['data'].info.rent[0] - }}~ - {{ - housingInfo['data'] && housingInfo['data'].info.rent[1] - }} + }} ~{{ housingInfo['data'] + && housingInfo['data'].info.rent[1] }} /{{ housingInfo['data'] && housingInfo['data'].info.rentalperiod }}
@@ -97,15 +99,20 @@
预算 HK$HK$ + + {{ + housingInfo['data'] && + housingInfo['data'].info.rent }} + {{ housingInfo['data'] && housingInfo['data'].info.rent[0] - }}~{{ - housingInfo['data'] && housingInfo['data'].info.rent[1] -}} + }} ~{{ housingInfo['data'] && + housingInfo['data'].info.rent[1] }} /{{ housingInfo['data'] && housingInfo['data'].info.rentalperiod }}
@@ -242,7 +249,8 @@
所在楼层
-
+
/{{ @@ -254,6 +262,12 @@
+
+ + {{ housingInfo['data'] && housingInfo['data'].info.floor }}层 + +
@@ -292,17 +306,29 @@ 面积
- + + + {{ + housingInfo['data'] && housingInfo['data'].info.acreage[0] ? + housingInfo['data'] + && + housingInfo['data'].info.acreage[0] : 0 + }} + ~ + {{ + housingInfo['data'] && housingInfo['data'].info.acreage[1] ? + housingInfo['data'] + && + housingInfo['data'].info.acreage[1] : 0 + }} + + + {{ - housingInfo['data'] && housingInfo['data'].info.acreage[0] ? housingInfo['data'] - && - housingInfo['data'].info.acreage[0] : 0 - }} - ~ - {{ - housingInfo['data'] && housingInfo['data'].info.acreage[1] ? housingInfo['data'] - && - housingInfo['data'].info.acreage[1] : 0 + housingInfo['data'] && housingInfo['data'].info.acreage }} 平方呎 @@ -428,7 +454,8 @@ 目标区域
-
+
@@ -446,6 +473,26 @@
+
+
+ + {{ + location && location[housingInfo['data'] && + housingInfo['data']['info'].location.substring(0, 1)] + }} + +
+ +
+
+ {{ + housingInfo['data'] && housingInfo['data']['info'].location.length == 1 ? '不限' : + location && location[housingInfo['data'] && housingInfo['data']['info'].location] + }} +
+
+
@@ -1346,7 +1393,7 @@ const onPageSrcoll = (e) => { let scrollTop = body.scrollTop let clientHeight = body.clientHeight let offsetHeight = body.offsetHeight - if (scrollTop + clientHeight >= offsetHeight-200) { + if (scrollTop + clientHeight >= offsetHeight - 200) { if (loadMore.value) { loadMore.value = false pages.value += 1 @@ -2029,16 +2076,14 @@ img { width: 210px; } - .fav-btn{ + .fav-btn {} - } - - .fav-btn:hover .fav-img-f{ + .fav-btn:hover .fav-img-f { opacity: 0.4; } - .fav-btn:hover .fav-img-t{ - opacity:0; + .fav-btn:hover .fav-img-t { + opacity: 0; } .tool-btn { @@ -2057,20 +2102,21 @@ img { font-size: 14px; cursor: pointer; - .fav-img{ + .fav-img { width: 20px; - height:20px; + height: 20px; position: absolute; - top:0; - left:0; + top: 0; + left: 0; transition: all linear 0.2s; } - .fav-img-f{ - opacity:0; + .fav-img-f { + opacity: 0; } - .fav-img-t{ - opacity:1; + + .fav-img-t { + opacity: 1; } .tool-icon { @@ -3014,6 +3060,5 @@ img { .el-icon { display: none; } -} - +} \ No newline at end of file