From 2e5147329f85fd7ea4aea472e601ecf0c3f9ee34 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Fri, 14 Jul 2023 18:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=20=20=20=E4=BF=AE=E6=94=B9=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexWaterfallBox/indexWaterfallBox.vue   |  9 ++++---
 src/components/pageTopBar/pageTopBar.vue      |  3 ++-
 src/components/seachModule/seachModule.vue    | 27 +++++++++----------
 src/components/selectTabBox/selectTabBox.vue  |  2 +-
 src/components/skeletonBox/skeletonBox.vue    |  2 +-
 src/views/HomeView.vue                        | 11 +++++---
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue
index 2382e77..703c378 100644
--- a/src/components/indexWaterfallBox/indexWaterfallBox.vue
+++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue
@@ -31,10 +31,10 @@
                 </span>
                 <span v-if="itemData.type === 'apartment'">{{ itemData.propaganda }}</span>
             </div>
-            <!-- <div style="padding: 0 10px;margin-top:15px;" class="dis-f al-item" v-if="itemData.type === 'housing'">
+            <div style="padding: 0 10px;margin-top:15px;" class="dis-f al-item" v-if="itemData.type === 'housing'">
                 <img src="../../assets/homeImage/addMarker.png" class="add-marker" alt="">
-                <span class="address-text">九龙 > 尖沙咀/佐敦</span>
-            </div> -->
+                <span class="address-text">{{ location.data&&location.data[itemData.location&&itemData.location.substring(0,1)] }} > {{ location.data&&location.data[itemData.location] }}</span>
+            </div>
             <div style="padding:0 10px;margin-top:12px;" v-if="itemData.type === 'housing'">
                 <span class="unit">{{ itemData.currency }}</span>
                 <span class="price">{{ itemData.rent }}</span>
@@ -90,6 +90,7 @@
   
 <script setup>
 import { defineProps, reactive } from 'vue'
+import store from '../../store/index';
 const props = defineProps({
     data: {
         type: Object,
@@ -99,6 +100,8 @@ const props = defineProps({
     }
 })
 let itemData = props.data
+let location=reactive({data:{}})
+location.data=store.state.indexData.config.location
 
 </script>
 <style scoped>
diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue
index 5a9f9b5..4b754d3 100644
--- a/src/components/pageTopBar/pageTopBar.vue
+++ b/src/components/pageTopBar/pageTopBar.vue
@@ -275,6 +275,7 @@ tabBtnType.value = route.path
   margin: 0 auto;
   width: 660px;
   height: 280px;
+  border-radius:15px;
 }
 
 .user-box:hover .user-out-box {
@@ -288,7 +289,7 @@ tabBtnType.value = route.path
   font-style: normal;
   font-size: 10px;
   position: absolute;
-  bottom: -35px;
+  bottom: -32px;
   display: none;
 }
 
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index d54dae2..4d6d10e 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -106,22 +106,18 @@ let historyArr = reactive({ data: [] })//历史查找记录
 let hotArr = reactive({ data: [] })
 
 //获取区域下列数据
-let getLocationData = () => {
+let getLocationData = (data) => {
     console.log(seachArea.data)
-    api.getLocationData().then(res => {
-        console.log(res)
-        if (res.code === 200) {
-            for (let item in res.data) {
-                if (!seachArea.data[item.substring(0, 1) - 1].data) seachArea.data[item.substring(0, 1) - 1].data = []
-                if (item.length > 1) {
-                    seachArea.data[item.substring(0, 1) - 1].data.push({
-                        title: res.data[item],
-                        id: item
-                    })
-                }
-            }
+    for (let item in data) {
+        if (!seachArea.data[item.substring(0, 1) - 1].data) seachArea.data[item.substring(0, 1) - 1].data = []
+        if (item.length > 1) {
+            seachArea.data[item.substring(0, 1) - 1].data.push({
+                title: data[item],
+                id: item
+            })
         }
-    })
+    }
+    console.log(store.state)
 }
 
 //监听路由
@@ -134,7 +130,8 @@ watchEffect(() => {
     hireType.data = store.state.seachTypeData[2] ? store.state.seachTypeData[2].where[0].data : []
     allHireType.data = store.state.seachTypeData[2] ? store.state.seachTypeData[2].where[1].data : []
     seachArea.data = store.state.seachTypeData[1] ? store.state.seachTypeData[1].where : []
-    if (seachArea.data.length > 0&&!seachArea.data[0].data) getLocationData()
+    if (seachArea.data.length > 0 && !seachArea.data[0].data) getLocationData(store.state.indexData.config.location
+)
     hotArr.data = store.state.indexData.hotSearcheWords
 })
 
diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue
index 3a57c4b..d5daebe 100644
--- a/src/components/selectTabBox/selectTabBox.vue
+++ b/src/components/selectTabBox/selectTabBox.vue
@@ -3,7 +3,7 @@
         <div class="select-box s-w-50 bor-r">
             <div class="dis-f bor-b-das" :class="{'al-item housing-pd':routePath==='/needHousing'}">
                 <div class="tab-title">{{routePath==='/needHousing'?'目标区域':'地理位置'}}</div>
-                <!-- 非求房源页面 -->
+                <!-- 中介/个人房源页面 -->
                 <div class="tab-text" v-if="routePath!=='/needHousing'">
                     <div class="dis-f">
                         <div class="btn  jus-x al-item dis-f" :class="{ 'btn-check': selectPosition === 'region' }"
diff --git a/src/components/skeletonBox/skeletonBox.vue b/src/components/skeletonBox/skeletonBox.vue
index 1999cb5..2062b2e 100644
--- a/src/components/skeletonBox/skeletonBox.vue
+++ b/src/components/skeletonBox/skeletonBox.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-skeleton style="width: 240px" animated="true">
+        <el-skeleton style="width: 240px" :animated="true">
             <template #template>
                 <el-skeleton-item variant="image" style="width: 240px; height: 240px" />
                 <div style="padding: 14px">
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 8e14bdf..ba3b3a0 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="home">
     <pageTopBar :bannerList="bannerList.data"></pageTopBar>
-    <!-- <headerNavigation></headerNavigation> -->
     <!-- 搜索模块 -->
     <seachModule></seachModule>
     <!-- 房源展示 -->
@@ -178,8 +177,9 @@
       </div>
     </div>
     <div class="dis-f jus-x bottom-tps">
-      - 到底了 -
+      - {{loadText}} -
     </div>
+    <footerTool></footerTool>
     <indexRegularBox></indexRegularBox>
   </div>
 </template>
@@ -192,7 +192,7 @@ import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox
 import seachModule from "../components/seachModule/seachModule.vue";
 import indexRegularBox from '../components/indexRegularBox/indexRegularBox.vue';
 import skeletonBox from '../components/skeletonBox/skeletonBox.vue'
-import headerNavigation from '../components/public/head.vue';
+import footerTool from '@/components/footer/footer.vue'
 import { useRouter } from 'vue-router'
 import store from '../store/index';
 import api from "../utils/api";
@@ -286,6 +286,7 @@ let addListData = (data) => {
 }
 //开关
 let loadMore = ref(true)
+let loadText=ref('加载中.....')
 //瀑布流数据
 let getRecommendList = () => {
   api.recommendList({
@@ -304,6 +305,7 @@ let getRecommendList = () => {
         loadMore.value = true
       } else {
         loadMore.value = false
+        loadText.value='到底了'
       }
     }
   })
@@ -325,7 +327,7 @@ let listDataTypeChange = (item) => {
 
 //监听滚动条
 const onPageSrcoll = (e) => {
-  if (!loadMore.value) return
+  if (!loadMore.value||waterfallList['4'].length===0) return
   let body = document.documentElement ? document.documentElement : document.body ?
     document.body :
     document.querySelector('.element');
@@ -412,6 +414,7 @@ img {
   font-size: 14px;
   color: #555555;
   text-align: center;
+  padding:30px 0;
 }
 
 .information-box {