Merge remote-tracking branch 'origin/main'

src/components/apartment/seachModule.vue

@@ -520,6 +520,7 @@ const selectOption = (type, value) => {
 
             &::placeholder {
                 color: #7f7f7f;
+                font-size:15px;
             }
         }
     }

src/components/biserialListItem/biserialListItem.vue

@@ -386,7 +386,7 @@ img {
             font-size: 14px;
             color: #555555;
             margin-top: 20px;
-            line-height:20px;
+            line-height:17px;
 
             .time {
                 font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
@@ -403,7 +403,7 @@ img {
                 font-weight: 900;
                 font-size: 20px;
                 color: #F95D5D;
-                line-height: 23px;
+                line-height: 20px;
                 margin:0 5PX;
             }
 
@@ -412,7 +412,7 @@ img {
                 font-weight: 900;
                 color: #000000;
                 font-size: 14px;
-                line-height:20px;
+                line-height:15px;
             }
         }
 

src/components/pageTopBar/pageTopBar.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="top-bg-img-box pos-r" :style="{ 'height': routePath === '/' ? '568px' : '260px' }">
-    <img src="../../assets/img/edit/bj-img1920.png" class="bg-img" alt="">
+    <img src="../../assets/homeImage/indexBg.jpg" class="bg-img" alt="" v-show="routePath === '/'">
+    <img src="../../assets//img/edit/bj-img1920.png" class="bg-img" alt="" v-show="routePath !== '/'">
     <div class="info-box">
       <!-- 顶部导航 -->
       <div class="dis-f jus-x al-item index-top-navigation-box">
@@ -387,7 +388,7 @@ const goIndex = () => router.push("/")
   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
   font-weight: 400;
   font-style: normal;
-  font-size: 16px;
+  font-size: 15px;
   color: #7F7F7F;
   text-align: left;
 }

src/components/seachModule/seachModule.vue

@@ -50,7 +50,7 @@
                             <img src="../assets/homeImage/mapImg.png" class="img" alt="">
                             地图找房
                         </div> -->
-                        <div class="tool-btn dis-f jus-x al-item add-btn" style="position: relative;">
+                        <div class="tool-btn dis-f jus-x al-item add-btn" :class="{'mg-l-10':routePath==='/'}" style="position: relative;">
                             <img src="../../assets/homeImage/addBtn.png" class="img" alt="">
                             发布房源
                             <choosing-identity></choosing-identity>
@@ -463,6 +463,9 @@ defineExpose({
                 margin-left: 20px;
                 cursor: pointer;
             }
+            .mg-l-10{
+                margin-left:10px;
+            }
 
             .tool-btn {
                 width: 160px;

src/views/HomeView.vue

@@ -249,7 +249,7 @@ let getRecommendList = () => {
         waterfallList.value = waterfallList.value.concat(res.data.data)
         pagevalue.value = res.data.pagevalue
       }
-      console.log(waterfallList.value)
+      // console.log(waterfallList.value)
       if (res.data.data.length >= 30) {
         loadMore.value = true
         loadText.value = '下拉加载更多'
@@ -258,11 +258,11 @@ let getRecommendList = () => {
         loadText.value = '到底了'
       }
       nextTick(() => {
-        console.log(1)
+        // console.log(1)
         listMasonryInstance.reloadItems();
         listMasonryInstance.layout();
         setTimeout(() => {
-          console.log(3)
+          // console.log(3)
           listMasonryInstance.reloadItems();
           listMasonryInstance.layout();
         }, 600)
@@ -697,7 +697,7 @@ img {
   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
   font-weight: 400;
   font-style: normal;
-  font-size: 16px;
+  font-size: 15px;
   color: #7F7F7F;
   text-align: left;
 }