From 0b3643e04d464ee4f7ece7e88a5d2688ab634832 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Mon, 31 Jul 2023 16:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BD=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=20=20=20=20=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=90=8C=E6=AD=A5url=20=20=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E6=90=9C=E7=B4=A2=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  |  5 ++
 src/components/seachModule/seachModule.vue   |  3 +-
 src/components/seachPage/input.vue           | 19 +++++--
 src/components/selectTabBox/selectTabBox.vue |  1 +
 src/views/HomeView.vue                       | 54 ++++++++++++++------
 src/views/detail.vue                         |  8 +--
 src/views/housingView/intermediary.vue       |  7 +--
 src/views/housingView/needHousing.vue        |  7 +--
 src/views/housingView/person.vue             |  7 +--
 src/views/seachIndex.vue                     | 37 ++------------
 10 files changed, 80 insertions(+), 68 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c3e2718..07efd99 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -73,6 +73,11 @@ img {
   width: 1200px;
 }
 
+.box-min-1200-src{
+  min-width:1200px;
+  overflow-x: scroll;
+}
+
 /* // 全局css 加上以下代码，可以隐藏上下箭头 */
 
 /* // 取消input的上下箭头 */
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index 4b457ee..00b42b6 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -175,19 +175,18 @@ let seachList = (item) => {
         historyArr.data.push(seachAllType.keyword)
     }
     localStorage.setItem('historyArr', JSON.stringify(historyArr.data));
+    sessionStorage.setItem('houseingPageType',routePath.value === '/needHousing' ? '6' : routePath.value === '/intermediaryHousing' ? '1' : routePath.value === '/personHousing' ? '0' : '0')
     route.push({
         path: '/seachPage',
         query: {
             keyword: seachAllType.keyword,
             isNeedHousing: routePath.value === '/needHousing',
-            houseingPageType: routePath.value === '/needHousing' ? 6 : routePath.value === '/intermediaryHousing' ? 1 : routePath.value === '/personHousing' ? 0 : 0
         }
     })
 }
 
 //设置搜索数据
 let setSeachConditions = (type, data,second=null) => {
-    console.log(type,data,second)
     if (type === 'rent') {
         seachAllType['rent_min'] = data.min
         seachAllType['rent_max'] = data.max
diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index 32eed59..097aff9 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -215,11 +215,14 @@ let selectPage = (type) => {
     seachAllType['searchid'] = setPageKey()
     if (type === 'person') {
         seachAllType['intermediary'] = 0
-        route.currentRoute.value.query.houseingPageType='0'
+        houseingPageType='0'
+        sessionStorage.setItem('houseingPageType',0)
         selectTabBoxInfo.value.routerQuerySet()
     } else if (type === 'intermediary') {
         seachAllType['intermediary'] = 1
-        route.currentRoute.value.query.houseingPageType='1'
+        houseingPageType='1'
+        sessionStorage.setItem('houseingPageType',1)
+        // route.currentRoute.value.query.houseingPageType='1'
         selectTabBoxInfo.value.routerQuerySet()
     } else {
         seachAllType['intermediary'] = ''
@@ -238,8 +241,8 @@ seachVal.value = route.currentRoute.value.query.keyword&&route.currentRoute.valu
 isNeedHousing.value = route.currentRoute.value.query.isNeedHousing === 'true'
 
 //判断当前是什么页面
-let houseingPageType = route.currentRoute.value.query.houseingPageType
-console.log('houseingPageType',route.currentRoute.value.query)
+let houseingPageType = sessionStorage.getItem('houseingPageType')
+console.log('houseingPageType',houseingPageType)
 let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment'
 tabType.value = type
 
@@ -336,6 +339,7 @@ let searchInit = (data) => {
 }
 //搜索数据
 let seachList = (item) => {
+    let routeInfo = route.currentRoute.value
     if (!seachVal.value.replace(/\s/g, "")) return
     if (!seachVal.value) {
         return
@@ -346,6 +350,13 @@ let seachList = (item) => {
     } else {
         searchInit(seachVal.value)
     }
+    route.push({
+        path:routeInfo.path,
+        query:{
+            keyword:seachVal.value,
+            isNeedHousing:routeInfo.query.isNeedHousing
+        }
+    })
 }
 
 //筛选词条
diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue
index b19424c..607a4f3 100644
--- a/src/components/selectTabBox/selectTabBox.vue
+++ b/src/components/selectTabBox/selectTabBox.vue
@@ -637,6 +637,7 @@ let setRouterQuerySet = ref(true)
 let routerQuerySet = () => {
     if(routePath.value==='/seachPage'){
         deconstructionSeachData = routeQuery.data
+        deconstructionSeachData.houseingPageType=sessionStorage.getItem('houseingPageType')
     }else{
        deconstructionSeachData = deconstructionData(routeQuery.data) 
     }
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 18363ae..c61012c 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="home">
+  <div class="home box-min-1200-src">
     <pageTopBar :bannerList="bannerList.data"></pageTopBar>
     <!-- 搜索模块 -->
     <seachModule :getDataList="personHouseingInfo"></seachModule>
@@ -21,7 +21,7 @@
               <div class="list-box">
                 <div class="dis-f al-item mg-b-5">
                   <img src="../assets/homeImage/informationO.png" class="img" alt="">
-                  <span class="title">攻略</span>
+                  <span class="title">{{ informationData && informationData[0].name }}</span>
                 </div>
                 <div v-for="(item, i) in informationData && informationData[0].list" :key="i"
                   class="dis-f al-item list-li">
@@ -34,7 +34,7 @@
               <div class="list-box">
                 <div class="dis-f al-item mg-b-5">
                   <img src="../assets/homeImage/informationT.png" class="img" alt="">
-                  <span class="title">科普</span>
+                  <span class="title">{{ informationData && informationData[1].name }}</span>
                 </div>
                 <div v-for="(item, i) in informationData && informationData[1].list" :key="i"
                   class="dis-f al-item list-li">
@@ -112,7 +112,24 @@
           <skeletonBox v-for="item in noWaterfallList" :key="item">
           </skeletonBox>
         </div>
-        <div class="waterfall-box s-w-100" ref="list"  v-show="waterfallList.length >0">
+        <div class="waterfall-box s-w-100" ref="list" v-show="waterfallList.length > 0">
+          <div class="waterfall-first-box item dis-f al-item jus-x" style="flex-wrap: wrap;">
+            <div v-for="(item, i) in indexData.data.tabs" :key="i" class="info-box dis-f al-item jus-x"
+            :class="[i==0?'first':i==1?'second':i==2?'third':'']"
+              style="flex-wrap: wrap;" @click="housingPage(item.path)">
+              <div>
+                <div class="img-box dis-f jus-x al-item">
+                  <img src="../assets/homeImage/person.png" alt="" v-if="i==0" class="img">
+                  <img src="../assets/homeImage/intermediary.png" alt="" v-if="i==1" class="img">
+                  <img src="../assets/homeImage/brand.png" alt="" v-if="i==2" class="img">
+                  <img src="../assets/homeImage/seek.png" alt="" v-if="i==3" class="img">
+                </div>
+                <div class="text-center s-w-100">
+                  {{ item.name }}
+                </div>
+              </div>
+            </div>
+          </div>
           <indexWaterfallBox v-for="(item, i) in waterfallList" :data="item" :key="i"></indexWaterfallBox>
         </div>
       </div>
@@ -168,18 +185,17 @@ watchEffect(() => {
   seachTypeData.data = store.state.seachTypeData
   indexData.data = store.state.indexData
   ListSelectBtn.data = store.state.ListSelectBtn
-  if (indexData.data.length) {
+  if (indexData.data.tabs.length) {
     indexData.data.tabs.map(res => {
-      if (res.name === "个人房源") {
+      if (res.url==='/pages/personList/personList') {
         res.path = '/personHousing'
-      } else if (res.name === "中介房源") {
+      } else if (res.url==='/pages/personList/personList?intermediary=1') {
         res.path = '/intermediaryHousing'
-      } else if (res.name === "求房源") {
+      } else if (res.url==="/pages/restOfWorld/restOfWorld") {
         res.path = '/needHousing'
-      } else if (res.name === "品牌公寓") {
-        res.path = ''
+      } else if (res.url==='/pages/irentList/irentList') {
+        res.path = '/apartment'
       }
-
     })
   }
   informationData.value = store.state.indexData.articleList
@@ -214,9 +230,10 @@ let banner = () => {
 
 //开关
 let loadMore = ref(true)
-let loadText = ref('加载中.....')
+let loadText = ref('下拉加载更多')
 //瀑布流数据
 let getRecommendList = () => {
+  loadText.value = '加载中.....'
   api.recommendList({
     page: pages.value,
     limit: 30,
@@ -232,6 +249,7 @@ let getRecommendList = () => {
       }
       if (res.data.data.length >= 30) {
         loadMore.value = true
+        loadText.value = '下拉加载更多'
       } else {
         loadMore.value = false
         loadText.value = '到底了'
@@ -253,10 +271,6 @@ let getRecommendList = () => {
 let listDataTypeChange = (item) => {
   ListSelectBtn.selectType = item.type
   loadMore.value = false
-  waterfallList[1] = []
-  waterfallList[2] = []
-  waterfallList[3] = []
-  waterfallList[4] = []
   pages.value = 1
   pagevalue.value = 0
   getRecommendList()
@@ -285,7 +299,6 @@ const router = useRouter()
 
 //跳转个人房源
 let personHouseingInfo = (type, data, areaItem) => {
-  console.log(type, data, areaItem)
   let areaItems = {}
   let setData = null
   if (type === "location") {
@@ -307,6 +320,13 @@ let personHouseingInfo = (type, data, areaItem) => {
   })
 }
 
+//跳转房源页
+let housingPage=(path)=>{
+  router.push({
+    path: path,
+  })
+}
+
 const list = ref(null)
 
 onMounted(() => {
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 6af1ea1..07c3209 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="box-min-1200-src">
         <pageTopBar></pageTopBar>
         <div class="dis-f jus-x al-item">
             <div class="body-maxWidth mg-t-35">
@@ -205,7 +205,7 @@
                             <div class="title dis-f al-item">
                                 <img src="../assets/img/detail/infoIcon.png" class="img" alt="">
                                 <span>
-                                    基本信息
+                                    {{pageType != 3?'基本信息':'基本要求'}}
                                 </span>
                             </div>
                             <!--  -->
@@ -1345,9 +1345,10 @@ let recommendListData = ref([])
 //广告参数
 let pagevalue = ref(0)
 //加载提示
-let loadText = ref('加载中......')
+let loadText = ref('下拉加载更多')
 //获取瀑布流数据
 let recommendList = () => {
+    loadText.value='加载中.....'
     api.recommendList({
         page: pages.value,
         limit: 30,
@@ -1359,6 +1360,7 @@ let recommendList = () => {
         if (res.code === 200) {
             if (res.data.data && res.data.data.length >= 30) {
                 loadMore.value = true
+                loadText.value='下拉加载更多'
             } else {
                 loadMore.value = false
                 loadText.value = '到底了'
diff --git a/src/views/housingView/intermediary.vue b/src/views/housingView/intermediary.vue
index 1195abf..64d3cb4 100644
--- a/src/views/housingView/intermediary.vue
+++ b/src/views/housingView/intermediary.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="box-min-1200-src">
         <pageTopBar></pageTopBar>
         <seachModule :count="dataList.count" :getDataList="setSeachSelectData"></seachModule>
         <div class="dis-f jus-x al-item">
@@ -48,7 +48,7 @@ let dataCount = ref(0)
 let pageList = ref([])
 let seachSelectData = reactive({ data: {} })
 let loading = ref(true)
-let loadingText=ref(' 加载中... ')
+let loadingText=ref(' 下拉加载更多 ')
 provide('count', dataCount)
 
 //保存搜索设置
@@ -63,6 +63,7 @@ let setSeachSelectData = (data) => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    loadingText.value=' 加载中..... '
     if(!loading.value)return
     loading.value = false
     let postData = {
@@ -77,7 +78,7 @@ let getDataList = (data) => {
             if(res.data.data.length<20){
                 loadingText.value=' 到底了 '
             }else{
-                loadingText.value=' 加载中... '
+                loadingText.value=' 下拉加载更多 '
             }
             if (pages.value === 1) {
                 pageList.value = []
diff --git a/src/views/housingView/needHousing.vue b/src/views/housingView/needHousing.vue
index 2e7c5b3..d29f63e 100644
--- a/src/views/housingView/needHousing.vue
+++ b/src/views/housingView/needHousing.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="box-min-1200-src">
         <pageTopBar></pageTopBar>
         <seachModule :count="dataList.count" :getDataList="setSeachSelectData"></seachModule>
         <div class="dis-f jus-x al-item">
@@ -49,7 +49,7 @@ let dataCount = ref(0)
 let pageList = ref([])
 let seachSelectData = reactive({ data: {} })
 let loading = ref(true)
-let loadingText=ref(' 加载中... ')
+let loadingText=ref(' 下拉加载更多 ')
 provide('count', dataCount)
 
 //保存搜索设置
@@ -64,6 +64,7 @@ let setSeachSelectData = (data) => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    loadingText.value=' 加载中..... '
     if(!loading.value)return
     loading.value = false
     let postData = {
@@ -78,7 +79,7 @@ let getDataList = (data) => {
             if(res.data.data.length<20){
                 loadingText.value=' 到底了 '
             }else{
-                loadingText.value=' 加载中... '
+                loadingText.value=' 下拉加载更多 '
             }
             if (pages.value === 1) {
                 pageList.value = []
diff --git a/src/views/housingView/person.vue b/src/views/housingView/person.vue
index 737145f..b883526 100644
--- a/src/views/housingView/person.vue
+++ b/src/views/housingView/person.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="box-min-1200-src">
         <pageTopBar></pageTopBar>
         <seachModule :getDataList="setSeachSelectData"></seachModule>
         <div class="dis-f jus-x al-item">
@@ -53,7 +53,7 @@ let dataCount = ref(0)
 let pageList = ref([])
 let seachSelectData = reactive({ data: {} })
 let loading = ref(true)
-let loadingText = ref(' 加载中... ')
+let loadingText = ref(' 下拉加载更多 ')
 provide('count', dataCount)
 
 //保存搜索设置
@@ -69,6 +69,7 @@ let setSeachSelectData = (data) => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    loadingText.value=' 加载中..... '
     if (!loading.value) return
     loading.value = false
     let postData = {
@@ -82,7 +83,7 @@ let getDataList = (data) => {
             if (res.data.data.length < 20) {
                 loadingText.value = ' 到底了 '
             } else {
-                loadingText.value = ' 加载中... '
+                loadingText.value = ' 下拉加载更多 '
             }
             if (pages.value === 1) {
                 pageList.value = []
diff --git a/src/views/seachIndex.vue b/src/views/seachIndex.vue
index d138e9a..96e2139 100644
--- a/src/views/seachIndex.vue
+++ b/src/views/seachIndex.vue
@@ -54,7 +54,7 @@ let pageList = ref([])
 // let pageList = reactive({ 1: [], 2: [], height1: 0, height2: 0, tab: 1 })//双列瀑布数据
 let seachSelectData = reactive({ data: {} })//搜索数据
 let loading = ref(true)//开关
-let loadingText = ref(` 加载中..... `)
+let loadingText = ref(` 下拉加载更多 `)
 let listApartment = ref([])//公寓数据
 let masonryInstance = null//瀑布实例
 let listMasonryInstance = null
@@ -86,6 +86,7 @@ let setInitial = () => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    loadingText.value=' 加载中..... '
     if (!loading.value) return
     let postData = {
         page: pages.value,
@@ -108,7 +109,7 @@ let getDataList = (data) => {
                 loadingText.value = ` 到底了 `
                 loading.value = false
             } else {
-                loadingText.value = ' 加载中... '
+                loadingText.value = ' 下拉加载更多 '
                 loading.value = true
             }
             if (seachSelectData.data.tabType !== 'apartment') {
@@ -123,7 +124,7 @@ let getDataList = (data) => {
                 nextTick(() => {
                     // if (dataList.data[0]) pageList['1'].push(dataList.data[0])
                     // if (dataList.data[1]) pageList['2'].push(dataList.data[1])
-                    console.log('listMasonryInstance',listMasonryInstance)
+                    // console.log('listMasonryInstance',listMasonryInstance)
                     listMasonryInstance.reloadItems();
                     listMasonryInstance.layout();
                 })
@@ -133,7 +134,6 @@ let getDataList = (data) => {
                 dataCount.value = res.data.count
                 if (pages.value === 1) listApartment.value = []
                 listApartment.value = listApartment.value.concat(data.data)
-                console.log(seachSelectData.data)
                 nextTick(() => {
                     masonryInstance.reloadItems();
                     masonryInstance.layout();
@@ -154,33 +154,6 @@ let getDataList = (data) => {
     })
 }
 
-//添加数据
-let addListData = () => {
-    let num = null
-    // console.log(pageList.tab , (dataList.count>20?dataList.data.length-2:dataList.count-2))
-    if (pageList.tab > (dataList.count > 20 ? dataList.data.length - 2 : dataList.count - 2)) {
-        if (dataList.data.length >= 20) {
-            loading.value = true
-        } else {
-            loading.value = false
-        }
-        return
-    }
-    pageList.tab++
-    if (pageList.height1 > pageList.height2) {
-        num = 2
-    } else {
-        num = 1
-    }
-    pageList[num].push(dataList.data[pageList.tab])
-}
-
-//监听图片加载
-let watchImgLoad = (id, listId, height) => {
-    pageList[`height${listId}`] += height
-    addListData()
-}
-
 //加载更多
 let downLoadMore = () => {
     tool.loadMore(() => {
@@ -211,9 +184,7 @@ onMounted(() => {
         inputModuleInfo.value.searchInit(routeQuery.data.keyword)//调用搜索组件的搜索功能
         route.currentRoute.value.query.keyword = ''
     } else {
-        console.log(seachSelectData.data)
         inputModuleInfo.value.checkPageType()
-        // getDataList(seachSelectData.data)
     }
     window.addEventListener('scroll', downLoadMore, true);
 })