From d024db53f44f94808399c0086a2443f10bea7947 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Mon, 31 Jul 2023 17:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E7=94=B5?=
 =?UTF-8?q?=E6=A2=AF=E9=9A=90=E8=97=8F=E6=9D=A1=E4=BB=B6=20=20=20=20=20?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E8=B7=9D=E7=A6=BB=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detail/breadcrumb.vue          |  2 +-
 .../indexWaterfallBox/indexWaterfallBox.vue   |  3 +-
 src/views/HomeView.vue                        |  7 ++--
 src/views/detail.vue                          | 34 +++++++++++--------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue
index 959d33d..37a672f 100644
--- a/src/components/detail/breadcrumb.vue
+++ b/src/components/detail/breadcrumb.vue
@@ -28,7 +28,7 @@
                 </div>
             </div>
         </div>
-        <div class="title-top-box pos-r" style="z-index:666;">
+        <div class="title-top-box pos-r">
             <div class="top-round" v-if="data['data'] && data['data'].info && data['data'].info.verified === 1||data['data'].isintermediary">
                 <div class="top-round-s" :class="[pageType==2?'intermediary-bg':'']"></div>
             </div>
diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index a0b960e..434e08a 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -94,7 +94,7 @@
 
         <!-- 广告 -->
     </div>
-    <img :src="itemData.imageLocal || itemData.image" class="live-img" v-if="itemData.type === 'adv'" alt=""
+    <img :src="itemData.imageLocal || itemData.image" class="live-img item" v-if="itemData.type === 'adv'" alt=""
         @click="watchAdv">
 </template>
   
@@ -431,6 +431,7 @@ let watchAdv = () => {
 .live-img {
     width: 285px;
     /* height: 349px; */
+    min-height:370px;
     border-radius: 16px;
     margin-bottom: 20px;
     cursor: pointer;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 0e0334a..40a7877 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -256,11 +256,9 @@ let getRecommendList = () => {
         loadText.value = '到底了'
       }
       nextTick(() => {
-        setTimeout(() => {
+          console.log(listMasonryInstance)
           listMasonryInstance.reloadItems();
           listMasonryInstance.layout();
-        })
-
       })
     } else {
       ElMessage({
@@ -336,8 +334,7 @@ const list = ref(null)
 onMounted(() => {
   listMasonryInstance = new Masonry(list.value, {
     itemSelector: '.item',
-    gutter: 20,
-    percentPosition: true
+    gutter: 20
   });
   document.documentElement.scrollTop = 0
   currentInstance = getCurrentInstance()
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 6e8e92f..ee75a79 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -359,7 +359,7 @@
                                     </span>
 
                                     <span class="text" style="margin-left:0;"
-                                        v-if="housingInfo['data'] && housingInfo['data'].info.elevator">
+                                        v-if="housingInfo['data'] && housingInfo['data'].info.elevator&&housingInfo['data'].info.elevator!=-1">
                                         <span style="color: #D7D7D7;">|</span>
                                         {{
                                             indexData['data'] &&
@@ -547,30 +547,32 @@
                             </div>
                         </div>
                         <div class="houseing-info-box dis-f al-item jus-bet">
-                            <div class="dis-f al-item houseing-info-box-s">
+                            <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.uid)">{{ housingInfo['data'] &&housingInfo['data'].info.uid }}</span>
                                 <span class="browse-box">
                                     浏览 : <span class="text">{{ housingInfo['data'] && housingInfo['data'].info.count_view
                                     }}</span>
                                 </span>
                             </div>
-                            <div class="dis-f al-item houseing-info-box-s">
+                            <div class="houseing-info-box-s"></div>
+                            <div class="dis-f al-item">
                                 <span>
                                     收藏 : &nbsp<span class="text">
                                         {{ housingInfo['data'] && housingInfo['data'].info.count_fav }}
                                     </span>
                                 </span>
                             </div>
-                            <div class="dis-f al-item houseing-info-box-s">
+                            <div class="houseing-info-box-s"></div>
+                            <div class="dis-f al-item">
                                 <span>
                                     发布 : &nbsp<span class="text">
                                         {{ housingInfo['data'] && housingInfo['data'].info.timestamp }}
                                     </span>
                                 </span>
                             </div>
-                            <div class="dis-f al-item houseing-info-box-s" style="border-right:0px">
+                            <div class="houseing-info-box-s"></div>
+                            <div class="dis-f al-item" style="border-right:0px">
                                 <span>
                                     更新 : &nbsp<span class="text">
                                         {{ housingInfo['data'] && housingInfo['data'].info.updatetime }}
@@ -1332,7 +1334,7 @@ const onPageSrcoll = (e) => {
         if (loadMore.value) {
             loadMore.value = false
             pages.value += 1
-            if (housingInfo['data'].isintermediary) {
+            if (housingInfo['data']&&housingInfo['data'].isintermediary) {
                 getPublisherList()
             } else {
                 recommendList()
@@ -1359,6 +1361,7 @@ let recommendList = () => {
     }).then(res => {
         console.log(res)
         if (res.code === 200) {
+            console.log(res.data.data && res.data.data.length >= 30)
             if (res.data.data && res.data.data.length >= 30) {
                 loadMore.value = true
                 loadText.value = '下拉加载更多'
@@ -1400,6 +1403,7 @@ let getPublisherList = () => {
     }).then(res => {
         console.log(res)
         if (res.code === 200) {
+            console.log(res.data.length >= 30)
             if (res.data.length >= 30) {
                 loadMore.value = true
             } else {
@@ -1441,10 +1445,8 @@ onMounted(() => {
         gutter: 10
     });
     if (pageType.value != 3) {
-        setTimeout(() => {
-            window.addEventListener('scroll', onPageSrcoll);
-            document.body.scrollTop = 0
-        }, 1000)
+        window.addEventListener('scroll', onPageSrcoll);
+        document.body.scrollTop = 0
     }
 })
 
@@ -2041,6 +2043,7 @@ img {
         margin-top: 30px;
         box-sizing: border-box;
         line-height: 20px;
+        word-wrap: break-word;
 
         .business-card-btn {
             width: 100px;
@@ -2539,7 +2542,7 @@ img {
         border-color: rgba(235, 235, 235, 1);
         border-radius: 10px;
         margin-top: 45px;
-        padding: 10px 0px;
+        padding: 10px 15px;
         font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
         font-weight: 400;
         font-style: normal;
@@ -2547,12 +2550,13 @@ img {
         font-size: 13px;
 
         .houseing-info-box-s {
-            padding: 0 15px;
+            height: 17px;
+            width:1px;
             border-right: 1px dashed #d7d7d7;
         }
 
         .browse-box {
-            margin-left: 160px;
+            margin-left: 130px;
 
             .text {
                 margin-left: 10px;