From 49f1105e285f6aa54d6b814c1add46d7ddf3c346 Mon Sep 17 00:00:00 2001 From: luJianJun <2587063613@qq.com> Date: Thu, 27 Jul 2023 12:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=90=8C=E6=AD=A5=20=20=20?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E6=88=BF=E6=BA=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biserialListItem/biserialListItem.vue | 9 +++- src/components/detail/breadcrumb.vue | 5 +- src/components/seachPage/input.vue | 13 +++-- src/components/selectTabBox/selectTabBox.vue | 2 +- src/router/index.js | 2 +- src/store/index.js | 4 +- src/views/detail.vue | 48 +++++++++++++------ 7 files changed, 57 insertions(+), 26 deletions(-) diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue index f426610..128e026 100644 --- a/src/components/biserialListItem/biserialListItem.vue +++ b/src/components/biserialListItem/biserialListItem.vue @@ -163,6 +163,13 @@ let pageType=ref('') //跳转 let router = useRouter() let watchInfo = () => { + let seachData=router.currentRoute.value.query + if(pageType.value===4){ + for(let key in data){ + store.state.seachSelect['seachPage'][key]=seachData[key] + } + console.log(store.state.seachSelect) + } router.push({ path: '/detail', query: { @@ -178,7 +185,7 @@ onMounted(() => { if(type){ pageType.value=type }else{ - pageType.value=routePath.value==='/personHousing'?1:routePath.value==='/intermediaryHousing'?2:routePath.value==='/needHousing'?3:'' + pageType.value=routePath.value==='/personHousing'?1:routePath.value==='/intermediaryHousing'?2:routePath.value==='/needHousing'?3:routePath.value==='/seachPage'?4:'' } }) diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue index ec3300a..18e884d 100644 --- a/src/components/detail/breadcrumb.vue +++ b/src/components/detail/breadcrumb.vue @@ -2,7 +2,7 @@
+ v-if="data['data'] && data['data'].info && (data['data'].info.verified === 1||data['data'].isintermediary)">
@@ -100,11 +100,10 @@ let {type}=router.currentRoute.value.query pageType.value=type //导航数据 let storeData = store.state.routeList -console.log('storeData', storeData) watchEffect(() => { data['data'] = props.data - console.log(data['data']) + console.log(pageType.value) }) diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue index fd887b1..14db734 100644 --- a/src/components/seachPage/input.vue +++ b/src/components/seachPage/input.vue @@ -45,7 +45,7 @@ v-show="tabType === 'need'"> 求房源
- 求房源 + 求房源{{ tabType }}
@@ -55,7 +55,7 @@
-
@@ -74,7 +74,7 @@ 中介房源 {{ seachKey.key && seachKey.key.intermediary && seachKey.key.intermediary.count }}
+ :class="{ 'select-top-btn-bg': tabType === 'apartment' }" v-if="!isNeedHousing&&houseingPageType!=6">
@@ -197,7 +197,7 @@ let selectTabBoxInfo = ref(null)//个人/中介筛选实例 let apartmentSelectInfo = ref(null)//公寓筛选实例 //设置请求数据 let selectPage = (type) => { - if (type === seachAllType['tabType']) return + if (type === seachAllType['tabType']||houseingPageType==6) return if (type === 'apartment') { selectTabBoxInfo.value.cleanSelect()//清空筛选数据 } else { @@ -228,13 +228,16 @@ let getDataList = props.getDataList //搜索内容 let seachVal = ref('') let isNeedHousing = ref(false) -seachVal.value = route.currentRoute.value.query.keyword.replace(/\s/g, "") +seachVal.value = route.currentRoute.value.query.keyword&&route.currentRoute.value.query.keyword.replace(/\s/g, "") //判断是否从求房源页面跳转 isNeedHousing.value = route.currentRoute.value.query.isNeedHousing === 'true' //判断当前是什么页面 let houseingPageType = route.currentRoute.value.query.houseingPageType +console.log('houseingPageType',houseingPageType) +let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment' +tabType.value = type //页面判断 let checkPageType = () => { diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index cdbeb67..ecf13f2 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -579,7 +579,7 @@ let routerQuerySet = () => { if (!setRouterQuerySet.value) return //路由参数设置 if ((routeQuery.data && routeQuery.data.houseingPageType === '1') || (routePath.value === '/intermediaryHousing')) { - otherData = reactive([{ title: '认证中介', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) + otherData = reactive([{ title: '认证中介', id: 'isintermediary' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) } else { otherData = reactive([{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) } diff --git a/src/router/index.js b/src/router/index.js index 9b8ad7f..636b18e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,7 +68,7 @@ const routes = [ } }, {//求房源 - path: '/needHousing/:type?/:data?/:areaItem?/:types?', + path: '/needHousing', component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/needHousing.vue'), meta: { title: '求房源', diff --git a/src/store/index.js b/src/store/index.js index 3fcf5a7..5fde63d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -19,7 +19,9 @@ export default createStore({ title:'', } },//导航路由列表 - seachSelect:{},//保存筛选条件 + seachSelect:{ + seachPage:{} + },//保存筛选条件 showloginmodal: false, // 是否需要登录状态 }, getters: { diff --git a/src/views/detail.vue b/src/views/detail.vue index ab6602e..e5ee1b8 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -1,7 +1,7 @@