diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue index 128e026..bc9fd77 100644 --- a/src/components/biserialListItem/biserialListItem.vue +++ b/src/components/biserialListItem/biserialListItem.vue @@ -182,10 +182,11 @@ let watchInfo = () => { onMounted(() => { imgRef = getCurrentInstance() let {type}=router.currentRoute.value.query + console.log(data.data) if(type){ pageType.value=type }else{ - pageType.value=routePath.value==='/personHousing'?1:routePath.value==='/intermediaryHousing'?2:routePath.value==='/needHousing'?3:routePath.value==='/seachPage'?4:'' + pageType.value=data.data.intermediary===1?2:data.data.intermediary===6?3:1 } }) diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue index 6dcdf07..68d54eb 100644 --- a/src/components/detail/imageWatch.vue +++ b/src/components/detail/imageWatch.vue @@ -6,10 +6,11 @@
- +
- +
@@ -25,12 +26,13 @@
-
+
-
- +
+
@@ -40,7 +42,7 @@ +} \ No newline at end of file diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue index 14db734..8c11f4d 100644 --- a/src/components/seachPage/input.vue +++ b/src/components/seachPage/input.vue @@ -215,8 +215,12 @@ let selectPage = (type) => { seachAllType['searchid'] = setPageKey() if (type === 'person') { seachAllType['intermediary'] = 0 + route.currentRoute.value.query.houseingPageType='0' + selectTabBoxInfo.value.routerQuerySet() } else if (type === 'intermediary') { seachAllType['intermediary'] = 1 + route.currentRoute.value.query.houseingPageType='1' + selectTabBoxInfo.value.routerQuerySet() } else { seachAllType['intermediary'] = '' } diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index ecf13f2..2b3482b 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -541,7 +541,7 @@ let setReleaseObj = (item) => { } //其他 -let otherData = reactive([{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) +let otherData = ref([{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) let otherCheck = reactive({ list: [] }) //设置其他 @@ -579,9 +579,11 @@ let routerQuerySet = () => { if (!setRouterQuerySet.value) return //路由参数设置 if ((routeQuery.data && routeQuery.data.houseingPageType === '1') || (routePath.value === '/intermediaryHousing')) { - otherData = reactive([{ title: '认证中介', id: 'isintermediary' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) - } else { - otherData = reactive([{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) + otherData.value = [{ title: '认证中介', id: 'isintermediary' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }] + } else if((routeQuery.data && routeQuery.data.houseingPageType === '6') || (routePath.value === '/needHousing')){ + otherData.value = [{ title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }] + }else{ + otherData.value = [{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }] } if (Object.keys(routeQuery.data).length > 0) { if (!routeQuery.data || routeQuery.data && !routeQuery.data.data) return @@ -601,7 +603,6 @@ let routerQuerySet = () => { selectTabCheck.title = areaItem.name selectTabCheck.data = list[areaItem.id].data; selectData.data = seachAreaId(data) - console.log(selectData.data.length) if (routeQuery.data.types) { let types = JSON.parse(routeQuery.data.types) let {data} = types @@ -631,7 +632,8 @@ watchEffect(() => { }) defineExpose({ - cleanSelect + cleanSelect, + routerQuerySet })