From 56fa9e96d1f7ba3e91cf2d74e0cca590b32e0dce Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Thu, 3 Aug 2023 16:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=94=B9=E4=B8=BA=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biserialListItem/biserialListItem.vue     | 15 ++++++----
 .../indexWaterfallBox/indexWaterfallBox.vue   | 16 +++++-----
 src/components/seachPage/input.vue            |  2 +-
 src/router/index.js                           |  5 ----
 src/views/HomeView.vue                        |  5 +++-
 src/views/detail.vue                          | 30 +++++++++++++++----
 6 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index f1e2f48..d40573e 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -184,12 +184,15 @@ let watchInfo = () => {
             store.state.seachSelect['seachPage'][key] = seachData[key]
         }
     }
-    router.push({
-        path: '/detail',
-        query: {
-            id: data.data.uniqid,
-        }
-    })
+    // console.log(document.location.origin)
+    // return
+    window.open(`${document.location.origin}/detail?id=${data.data.uniqid}`)
+    // router.push({
+    //     path: '/detail',
+    //     query: {
+    //         id: data.data.uniqid,
+    //     }
+    // })
 }
 
 onMounted(() => {
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index aa1e852..04cad7b 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -116,13 +116,15 @@ location.data = store.state.indexData.config.location
 
 let router = useRouter()
 let watchInfo = () => {
-    router.push({
-        path: itemData.type === 'apartment' ? '/apartmentDetail' : '/detail',
-        query: {
-            // id: itemData.type=='apartment'?itemData.id:itemData.uniqid,
-            [itemData.type == 'apartment' ? "uniqid" : "id"]: itemData.type == 'apartment' ? itemData.id : itemData.uniqid
-        }
-    })
+    // console.log(router,window.location.href)
+    window.open(`${router,window.location.href}${itemData.type === 'apartment' ? 'apartmentDetail' : 'detail'}?${itemData.type == 'apartment' ? "uniqid" : "id"}=${itemData.type == 'apartment' ? itemData.id : itemData.uniqid}`)
+    // router.push({
+    //     path: itemData.type === 'apartment' ? '/apartmentDetail' : '/detail',
+    //     query: {
+    //         // id: itemData.type=='apartment'?itemData.id:itemData.uniqid,
+    //         [itemData.type == 'apartment' ? "uniqid" : "id"]: itemData.type == 'apartment' ? itemData.id : itemData.uniqid
+    //     }
+    // })
 }
 
 let watchAdv = () => {
diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index 7497ef0..ad36d84 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -450,7 +450,7 @@ let getLocationData = (data) => {
 
 //更新当前数据数量
 let setListCount = (item, num) => {
-    console.log(item, num)
+    // console.log(item, num)
     // console.log(seachKey.key)
     if (item.tabType === "intermediary") {
         seachKey.key['intermediary']['count'] = num
diff --git a/src/router/index.js b/src/router/index.js
index 8a8986c..1416a04 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -120,11 +120,6 @@ const router = createRouter({
 
 
 router.beforeEach((to, from, next) => {
-  //导航数据
-  if (/['needHousing','intermediaryHousing','personHousing']/.test(from.path)) {
-    store.state.routeList.secondaryIndex.title = from.meta.title
-    store.state.routeList.secondaryIndex.path = from.meta.path
-  }
   next()
   let meta = to['meta'] || {}
   let title = meta['title']
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 245a2d9..03e7e00 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -355,7 +355,10 @@ onBeforeUnmount(() => {
 })
 
 // 公共跳转
-const publicJump = path => router.push(path)
+const publicJump = path => {
+  //router.push(path)
+  window.open(`${document.location.origin}${path}`)
+}
 
 
 </script>
diff --git a/src/views/detail.vue b/src/views/detail.vue
index bf87bf4..5021692 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -514,7 +514,8 @@
                                     <!-- <img src="../assets/img/detail/line.svg" class="line-img" alt=""> -->
                                     <div class="dis-f al-item s-w-100" style="position:absolute;">
                                         <div class="line-school-box dis-f al-item" style="justify-content:space-around;">
-                                            <div v-for="(item, i) in distanceList" class="box-text" :key="item && item.id">
+                                            <div v-for="(item, i) in distanceList" class="box-text" :key="item && item.id"
+                                                v-show="i < 9&&item.id">
                                                 <div :class="{ 'far-s': item && item.recently_distance > 4 }"
                                                     v-if="item && !item.address" class="text-c">
                                                     {{ item && item.recently_distance }}km
@@ -556,10 +557,10 @@
                         <div class="houseing-info-box dis-f al-item jus-bet">
                             <div class="dis-f al-item">
                                 房源ID : &nbsp<span class="houseing-id" @click="clone(housingInfo['data'] &&
-                                    housingInfo['data'].info.uid)">{{ housingInfo['data']
-        && housingInfo['data'].info.uid }}</span>
+                                    housingInfo['data'].info.id)">{{ housingInfo['data'] && housingInfo['data'].info.id
+    }}</span>
                                 <span class="browse-box">
-                                    浏览 : <span class="text">{{ housingInfo['data'] && housingInfo['data'].info.count_view
+                                    浏览 :<span class="text">{{ housingInfo['data'] && housingInfo['data'].info.count_view
                                     }}</span>
                                 </span>
                             </div>
@@ -1174,8 +1175,10 @@ let clone = (text) => {
     document.body.removeChild(textareaEle);
     ElMessage({
         message: '复制成功',
-        type: 'success',
         center: true,
+        offset: 320,
+        duration:1000,
+        customClass: 'message-info'
     })
 }
 
@@ -2725,7 +2728,7 @@ img {
 
     .show-distance-info-box {
         border-width: 1px;
-        border-style: solid;
+        /* border-style: solid; */
         border-color: rgba(235, 235, 235, 1);
         -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
         -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196);
@@ -2967,4 +2970,19 @@ img {
     z-index: 999;
 }
 </style>
+<style>
+.message-info {
+    background: #000000;
+    border-color: #000000;
+    color: #fff;
+
+    .el-message__content {
+        color: #fff;
+    }
+
+    .el-icon {
+        display: none;
+    }
+}
+</style>
   
\ No newline at end of file