diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue index 7d9b92d..5f87f45 100644 --- a/src/components/detail/breadcrumb.vue +++ b/src/components/detail/breadcrumb.vue @@ -29,7 +29,7 @@
-
+
@@ -229,8 +229,9 @@ img { height: 20px; } .intermediary-bg{ - background: rgba(173,214,247,1); + background: rgba(173,214,247,1) !important; } + } .breadcrumb-box { diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue index a24c926..39c3286 100644 --- a/src/components/seachModule/seachModule.vue +++ b/src/components/seachModule/seachModule.vue @@ -161,9 +161,7 @@ historyArr.data = JSON.parse(localStorage.getItem('historyArr')) || [] //搜索数据 let seachList = (item) => { - // console.log(123) let string = seachAllType.keyword - if (historyArr.data.indexOf(seachAllType.keyword) === -1) { historyArr.data.push(seachAllType.keyword) } @@ -186,6 +184,7 @@ let setSeachConditions = (type, data) => { } else if (type !== '') { seachAllType[type] = data } else if (type === '') { + data.indexOf('isintermediary') !== -1 ? seachAllType['isintermediary'] = 1 : seachAllType['isintermediary'] = 0 data.indexOf('isverified') !== -1 ? seachAllType['isverified'] = 1 : seachAllType['isverified'] = 0 data.indexOf('iselevator') !== -1 ? seachAllType['iselevator'] = 1 : seachAllType['iselevator'] = 0 data.indexOf('issunshinearea') !== -1 ? seachAllType['issunshinearea'] = 1 : seachAllType['issunshinearea'] = 0 @@ -196,7 +195,7 @@ let setSeachConditions = (type, data) => { if (type === 'location') { seachAllType.school = '' } - console.log('seachAllType', seachAllType) + // console.log('seachAllType', seachAllType) getDataList(seachAllType) } @@ -212,7 +211,7 @@ let setHotSeach = (item) => { seachAllType.keyword = item if (historyArr.data.indexOf(item) === -1) historyArr.data.push(item) localStorage.setItem('historyArr', JSON.stringify(historyArr.data)); - getDataList(seachAllType) + seachList() } //点击选项 diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index d4a695f..fdedc86 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -19,9 +19,9 @@ @click="setSelectData(item.id, item.data, item.name)" v-for="(item, i) in list" :key="i">
{{ item.name }}
 >  -
+
{{ - selectData.data && selectData.data.length === 0 ? '不限' : + selectData.data && selectData.data.length === 0||selectData.data.length===selectTabCheck.data.length ?'不限' : selectData.data && selectData.data.length }}
@@ -204,7 +204,7 @@  
{{ selectTabCheck.title }}:
-
+
{{ item.title }} @@ -469,8 +469,6 @@ let listSortCheck = (item) => { //出租方式 let hireTypeArr = shallowReactive([{ hireType: [], title: '不限' }, { title: '合租', hireType: [] }, { hireType: [], title: '整租' }]) -// { hireType: [{ id: '', title: '不限' }, { id: '1', title: '独卫套房' }, { id: '2', title: '房间' },], title: '合租' }, -// { hireType: [{ id: '', title: '不限' }, { id: '3', title: '3' }, { id: '4', title: '3' },], title: '整租' } //设置出租方式 let setHireTypeArr = (type, id) => { @@ -554,7 +552,6 @@ let otherCheck = reactive({ list: [] }) //设置其他 let setOtherCheck = (data) => { - // setStoreSelectData('otherCheck',data) setSeachCondition('', data) } @@ -580,10 +577,45 @@ let cleanSelect = () => { // setCheckData([]) } +//获取一级区域 +let getAddressListId=(id)=>{ + list.map(res=>{ + if(res.id==id){ + console.log(res) + return res + } + }) +} + +//解数据 +let deconstructionData=(data={})=>{ + //第一个为type + //type第一个参数为一级区域 第二个参数为二级区域 + let seachData={} + let key = Object.keys(data) + key.map((res,index)=>{ + if(index===0){//类型 + seachData['type']=res + seachData['selectData']=data[res] + } + if(index===1){//一级区域类型 + let address=getAddressListId(data[res]) + console.log(address) + seachData['areaItem']={id:'',name:'',data:''} + seachData['areaItem'].id=address.id + seachData['areaItem'].name=address.name + seachData['areaItem'].data=address.data + } + }) + console.log(seachData) +} + //根据路由设置参数 let setRouterQuerySet = ref(true) let routerQuerySet = () => { console.log(123, routeQuery) + deconstructionData(routeQuery.data) + return if (!setRouterQuerySet.value) return //路由参数设置 if ((routeQuery.data && routeQuery.data.houseingPageType === '1') || (routePath.value === '/intermediaryHousing')) { @@ -595,7 +627,7 @@ let routerQuerySet = () => { } if (Object.keys(routeQuery.data).length > 0) { if (!routeQuery.data || routeQuery.data && !routeQuery.data.data) return - let data = JSON.parse(routeQuery.data.data) + let data = routeQuery.data.data.split(',') if (routeQuery.data.type === 'school') { selectPosition.value = 'school' schoolSelectObj.id = data.id @@ -606,10 +638,11 @@ let routerQuerySet = () => { hireTypeObj.title = data.name hireTypeObj.hireId = type == 1 ? '合租' : type == 2 ? '整租' : '不限' } else if (routeQuery.data.type === 'location') { - let areaItem = routeQuery.data.areaItem ? JSON.parse(routeQuery.data.areaItem) : '' - selectTabCheck.id = areaItem.id * 1; - selectTabCheck.title = areaItem.name - selectTabCheck.data = list[areaItem.id].data; + let areaItem = routeQuery.data.areaItem ? routeQuery.data.areaItem.split(',') : '' + selectTabCheck.id = areaItem[0]*1; + selectTabCheck.title = areaItem[1]; + selectTabCheck.data = list[selectTabCheck.id].data; + console.log(list) selectData.data = seachAreaId(data) if (routeQuery.data.types) { let types = JSON.parse(routeQuery.data.types) @@ -622,7 +655,6 @@ let routerQuerySet = () => { setCheckBoxData(data)//设置地区选项 } } - setRouterQuerySet.value = false } diff --git a/src/router/index.js b/src/router/index.js index 636b18e..34bd27a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,7 +52,7 @@ const routes = [ } }, {//个人房源 - path: '/personHousing/:type?/:data?/:areaItem?/:types?', + path: '/personHousing', component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/person.vue'), meta: { title: '个人房源', diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 96020b9..7656a25 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -113,7 +113,7 @@
-
+
@@ -121,7 +121,7 @@
{{ indexData.data.tabs && indexData.data.tabs[0].name }}
-
+
@@ -129,7 +129,7 @@
{{ indexData.data.tabs && indexData.data.tabs[1].name }}
-
+
@@ -137,7 +137,7 @@
{{ indexData.data.tabs && indexData.data.tabs[2].name }}
-
+
@@ -361,19 +361,21 @@ const onPageSrcoll = (e) => { //瀑布流模块 const router = useRouter() let indexWaterfallBoxCheck = (res) => { + console.log(res) router.push({ - path: res.path + path: res }) } //跳转个人房源 let personHouseingInfo = (type, data, areaItem) => { + console.log(type, data, areaItem) + let areaItems=JSON.parse(areaItem) router.push({ path: `/personHousing`, query: { - type, - data: JSON.stringify(data), - areaItem + [type]:data.toString(), + areaItem:`${areaItems['id']}` }, // params:{ // type, diff --git a/src/views/detail.vue b/src/views/detail.vue index 03dbbe9..52d5cf2 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -857,7 +857,7 @@
-
+