From a5e6ebc76f91f3965c2d76ced6d003a8fbbae01a Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Thu, 27 Jul 2023 15:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=80=91=E5=B8=83=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detail/breadcrumb.vue                  |  2 +-
 .../indexWaterfallBox/indexWaterfallBox.vue           |  9 ++++++---
 src/components/seachPage/input.vue                    |  2 +-
 src/views/detail.vue                                  |  8 +++++++-
 src/views/housingView/person.vue                      | 11 ++---------
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue
index 18e884d..7d9b92d 100644
--- a/src/components/detail/breadcrumb.vue
+++ b/src/components/detail/breadcrumb.vue
@@ -34,7 +34,7 @@
             </div>
             <div class="breadcrumb-box">
                 <el-breadcrumb :separator-icon="ArrowRight">
-                    <el-breadcrumb-item v-for="(item, i) in storeData" :key="i" :to="{ path: item.path }">
+                    <el-breadcrumb-item v-for="(item, i) in storeData" :key="i" :to="{ path: item.path,query:item.query }">
                         <span class="breadcrumb-text">
                             {{ item.title }}
                         </span>
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index 545f5b6..35ad128 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -47,7 +47,8 @@
                 年轻有活力且超有玩趣的公寓
             </div> -->
         <div class="suite-box" v-if="itemData.type === 'apartment'">
-            <div class="dis-f al-item jus-bet">
+            <div class="dis-f al-item jus-bet" v-if="itemData.specifications &&
+                        itemData.specifications[0] && itemData.specifications[0].value">
                 <div class="suite-type">
                     {{ itemData.specifications && itemData.specifications[0] && itemData.specifications[0].title }}
                 </div>
@@ -58,8 +59,10 @@
                     <span class="date">/月</span>
                 </div>
             </div>
-            <div class="line"></div>
-            <div class="dis-f al-item jus-bet">
+            <div class="line" v-if="itemData.specifications &&
+                        itemData.specifications[1] && itemData.specifications[1].value"></div>
+            <div class="dis-f al-item jus-bet" v-if="itemData.specifications &&
+                        itemData.specifications[1] && itemData.specifications[1].value">
                 <div class="suite-type">
                     {{ itemData.specifications && itemData.specifications[1] && itemData.specifications[1].title }}
                 </div>
diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index 8c11f4d..fcbd3bf 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -239,7 +239,7 @@ isNeedHousing.value = route.currentRoute.value.query.isNeedHousing === 'true'
 
 //判断当前是什么页面
 let houseingPageType = route.currentRoute.value.query.houseingPageType
-console.log('houseingPageType',houseingPageType)
+console.log('houseingPageType',route.currentRoute.value.query)
 let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment'
 tabType.value = type
 
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 96cfe50..03dbbe9 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -1140,7 +1140,13 @@ let setNavigation = () => {
         // type=location&data=["2.2"]&areaItem={"id":2,"name":"九龙"}
         // console.log(`${store.state.routeList['secondaryIndex'].path}/location/${JSON.stringify([housingInfo['data']['info'].location.substring(0, 1)])}`)
         store.state.routeList['thirdIndex'] = {
-            path: `${store.state.routeList['secondaryIndex'].path}/location/${JSON.stringify([housingInfo['data']['info'].location.substring(0, 1)])}/${JSON.stringify({ id: housingInfo['data']['info'].location.substring(0, 1), name: location[housingInfo['data']['info'].location.substring(0, 1)] })}/${JSON.stringify({ type: 'types', data: { name: type[housingInfo['data']['info'].type.substring(0, 1)], id: housingInfo['data']['info'].type } })}`,
+            path: `${store.state.routeList['secondaryIndex'].path}`,
+            query:{
+                type:'location',
+                name: location[housingInfo['data']['info'].location.substring(0, 1)],
+                id: housingInfo['data']['info'].location.substring(0, 1),
+                types:`${type[housingInfo['data']['info'].type.substring(0, 1)]},${housingInfo['data']['info'].type}`
+            },
             title: `${location[housingInfo['data']['info'].location.substring(0, 1)]}${type[housingInfo['data']['info'].type.substring(0, 1)]}房源`
         }
         if (housingInfo['data']['info'].location.length > 0)
diff --git a/src/views/housingView/person.vue b/src/views/housingView/person.vue
index 35f5bcc..c54d07a 100644
--- a/src/views/housingView/person.vue
+++ b/src/views/housingView/person.vue
@@ -143,15 +143,8 @@ let downLoadMore = () => {
 
 //listImg
 onMounted(() => {
-    let type=null,data=null
-    console.log(router.currentRoute.value.params)
-    if (router.currentRoute.value.params.type) {
-        type=router.currentRoute.value.params.type
-        data=router.currentRoute.value.params.data
-    } else {
-        type=router.currentRoute.value.query.type
-        data=router.currentRoute.value.query.data
-    }
+    console.log(router.currentRoute.value.query)
+    let {type,data}=router.currentRoute.value.query
     let typeData = null
     if (data) typeData = JSON.parse(data)
     if (data && Object.keys(data).length > 0) {