From 13dacfe5d366c5b7ecb6548af6016434bb36b9d1 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Wed, 26 Jul 2023 17:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biserialListItem/biserialListItem.vue     |  1 -
 .../indexWaterfallBox/indexWaterfallBox.vue   | 15 +++++++-
 src/views/HomeView.vue                        |  4 +-
 src/views/detail.vue                          | 37 ++++++++++++-------
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/components/biserialListItem/biserialListItem.vue b/src/components/biserialListItem/biserialListItem.vue
index 9f171e0..8dae67f 100644
--- a/src/components/biserialListItem/biserialListItem.vue
+++ b/src/components/biserialListItem/biserialListItem.vue
@@ -175,7 +175,6 @@ let watchInfo = () => {
 onMounted(() => {
     imgRef = getCurrentInstance()
     let {type}=router.currentRoute.value.query
-    console.log('type',type)
     if(type){
         pageType.value=type
     }else{
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index 6f160fb..b895007 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -1,6 +1,6 @@
 <template>
         <div class="waterfall-box" v-if="itemData.type !== 'adv'"
-            :class="{ 'waterfall-box-housing': itemData.type === 'housing' }">
+            :class="{ 'waterfall-box-housing': itemData.type === 'housing' }" @click="watchInfo">
             <div class="flexflex pos-r">
                 <div class="box-tab-type" v-if="itemData.intermediarytext">
                     {{ itemData.intermediarytext }}
@@ -89,6 +89,7 @@
 <script setup>
 import { defineProps, reactive } from 'vue'
 import store from '../../store/index';
+import { useRouter } from 'vue-router'
 const props = defineProps({
     data: {
         type: Object,
@@ -101,6 +102,18 @@ let itemData = props.data
 let location=reactive({data:{}})
 location.data=store.state.indexData.config.location
 
+let router=useRouter()
+let watchInfo=()=>{
+    console.log(itemData.type)
+    router.push({
+        path:itemData.type==='apartment'?'/apartmentDetail':'/detail',
+        query: {
+            id: itemData.type=='apartment'?itemData.id:itemData.uniqid,
+            type:itemData.intermediary=='1'?2:itemData.intermediary=='6'?3:!itemData.intermediary?'':1
+        }
+    })
+}
+
 let watchAdv=()=>{
     
 }
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 1692fb8..96020b9 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -185,7 +185,7 @@
       - {{ loadText }} -
     </div>
     <footerTool></footerTool>
-    <indexRegularBox></indexRegularBox>
+    <!-- <indexRegularBox></indexRegularBox> -->
   </div>
 </template>
 
@@ -195,7 +195,7 @@ import listItem from "../components/apartmentList/apartmentList.vue";
 import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
 import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox.vue";
 import seachModule from "../components/seachModule/seachModule.vue";
-import indexRegularBox from '../components/indexRegularBox/indexRegularBox.vue';
+// import indexRegularBox from '../components/indexRegularBox/indexRegularBox.vue';
 import skeletonBox from '../components/skeletonBox/skeletonBox.vue'
 import footerTool from '@/components/footer/footer.vue'
 import { useRouter } from 'vue-router'
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 4e37bff..05ad751 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -162,16 +162,16 @@
                             <div class="img-list-box dis-f jus-x al-item" @click="imageShow = true"
                                 v-show="imgList.length > 0">
                                 <img src="../assets/img/detail/moreNot.svg" class="icon left-icon" alt=""
-                                    @click.stop="moveImageList('left')" v-show="imgListTab === 0">
+                                    @click.stop="moveImageList('left')" v-show="imgListTab === 0&&imageLIst[imageLIst.length-1]>800">
                                 <img src="../assets/img/detail/moreAllow.svg" class="icon left-icon" alt=""
                                     style="transform: rotate(180deg);" @click.stop="moveImageList('left')"
-                                    v-show="imgListTab > 0">
+                                    v-show="imgListTab > 0&&imageLIst[imageLIst.length-1]>800">
                                 <img src="../assets/img/detail/moreAllow.svg" class="icon right-icon" alt=""
-                                    @click.stop="moveImageList('right')" v-show="imgList.length - 1 !== imgListTab">
+                                    @click.stop="moveImageList('right')" v-show="imgList.length - 1 !== imgListTab&&imageLIst[imageLIst.length-1]>800">
                                 <img src="../assets/img/detail/moreNot.svg" class="icon right-icon" alt=""
                                     style="transform: rotate(180deg);" @click.stop="moveImageList('right')"
-                                    v-show="imgList.length - 1 === imgListTab">
-                                <div class="dis-f al-item list-box" ref="imageList" v-if="imgList.length > 0">
+                                    v-show="imgList.length - 1 === imgListTab&&imageLIst[imageLIst.length-1]>800">
+                                <div class="dis-f al-item list-box s-w-100" ref="imageList" v-if="imgList.length > 0">
                                     <div v-for="(item, i) in imgList" :key="i">
                                         <div class="video" v-if="item && !item.thumbnail">
                                             <div class="icon-box dis-f jus-x al-item">
@@ -330,10 +330,11 @@
                                         所在楼层
                                     </div>
                                     <span class="text">
-                                        {{ housingInfo['data'] && housingInfo['data'].info.floor }}
+                                        {{ housingInfo['data'] && housingInfo['data'].info.floor }}&nbsp
                                     </span>
-                                    |
-                                    <span class="text" style="margin-left:0;">
+                                    
+                                    <span class="text" style="margin-left:0;" v-if="housingInfo['data'] &&housingInfo['data'].info.elevator">
+                                        |
                                         {{
                                             indexData['data'] &&
                                             indexData['data']['config'] &&
@@ -588,7 +589,8 @@
                                     {{
                                         indexData['data'] &&
                                         indexData['data']['config'] &&
-                                        indexData['data']['config']['intermediary'][housingInfo['data'] &&
+                                        indexData['data']['config']['intermediary'][
+                                        housingInfo['data'] &&
                                         housingInfo['data'].info.intermediary]
                                     }}
                                 </div>
@@ -600,9 +602,10 @@
                                     }} </span>
                             </div>
                             <div v-if="checkUpdateTime(housingInfo['data'] && housingInfo['data'].info.updatetime)">
-                                <div class="dis-f al-item jus-x time-box" v-if="housingInfo['data'] &&
+                                <div class="dis-f al-item jus-x time-box" v-if="
+                                    housingInfo['data'] &&
                                     housingInfo['data'].intermediarylistingcount > 0 &&
-                                    housingInfo['data']['config']['intermediary'] == 1 &&
+                                    housingInfo['data']&&['config']['intermediary'] == 1 &&
                                     housingInfo['data'].isintermediary == 1">
                                     <img src="../assets/img/detail/presonNumIcon.png" class="icon" alt="">
                                     <span>房源 x{{ housingInfo['data'] && housingInfo['data'].intermediarylistingcount
@@ -702,7 +705,7 @@
         <!-- 中介名片弹窗 -->
         <div class="dis-f jus-x al-item business-card-img-pop" v-show="showBusinessCard">
             <img src="../assets/img/detail/imageClose.svg" @click="showBusinessCard = false" class="close-img" alt="">
-            <img :src="contacts['data'].businesscard" class="img" alt="">
+            <img :src="contacts['data'].businesscard&&contacts['data'].businesscard[0].image" class="img" alt="">
         </div>
         <!-- 推荐 -->
         <div class="dis-f jus-x" v-if="pageType != 3">
@@ -1099,10 +1102,13 @@ let location = store.state.indexData.config && store.state.indexData.config.loca
 let setNavigation = () => {
     let type = store.state.indexData.config && store.state.indexData.config.type
     indexData['data'] = store.state.indexData
+    console.log('routeLis',store.state)
     if (!location) return
     if (pageType.value == 1 || pageType.value == 2) {
+        // type=location&data=["2.2"]&areaItem={"id":2,"name":"九龙"}
+        console.log(`${store.state.routeList['secondaryIndex'].path}?type=location&data=${housingInfo['data']['info'].location.substring(0, 1)}`)
         store.state.routeList['thirdIndex'] = {
-            path: "",
+            path: `${store.state.routeList['secondaryIndex'].path}?type=location&data=${housingInfo['data']['info'].location.substring(0, 1)}`,
             title: `${location[housingInfo['data']['info'].location.substring(0, 1)]}${type[housingInfo['data']['info'].type.substring(0, 1)]}房源`
         }
         if (housingInfo['data']['info'].location.length > 0)
@@ -1317,6 +1323,7 @@ onMounted(() => {
     if (pageType.value != 3) {
         setTimeout(() => {
             window.addEventListener('scroll', onPageSrcoll, true);
+            document.body.scrollTop=0
         }, 1000)
     }
 
@@ -1456,7 +1463,8 @@ img {
     }
 
     .img {
-        width: 1200px;
+        width: 800px;
+        height:800px;
     }
 }
 
@@ -1925,6 +1933,7 @@ img {
             font-size: 14px;
             color: #333;
             cursor: pointer;
+            margin-top:10px;
 
             .logo {
                 width: 22px;