个人/中介 搜索 求房源 首页更新

src/views/housingView/needHousing.vue

@@ -20,6 +20,7 @@
             </div>
         </div>
         <listBtmPrompt></listBtmPrompt>
+        <footerTool></footerTool>
     </div>
 
     <!-- 右下角咨询 -->
@@ -37,6 +38,7 @@ import circleBtn from '@/components/public/circle-btn.vue'
 import api from "../../utils/api";
 import tool from '../../toolJs/downLoadMore'
 import { ElMessage } from 'element-plus'
+import footerTool from '@/components/footer/footer.vue'
 
 //获取数据
 let pages = ref(1)
@@ -44,22 +46,16 @@ let dataList = reactive({ data: [], count: 0 })
 let dataCount = ref(0)
 let pageList = reactive({ 1: [], 2: [], height1: 0, height2: 0, tab: 1 })
 let seachSelectData = reactive({ data: {} })
-let loading = ref(false)
+let loading = ref(true)
 provide('count', dataCount)
 
 //保存搜索设置
 let setSeachSelectData = (data) => {
     pages.value = 1
-
-    // if(data.location.length>0){
-    //     data.location=JSON.stringify(data.location)
-    // }
     seachSelectData.data = {
         ...data
     }
     loading.value = true
-    console.log('seachSelectData', seachSelectData.data)
-    return
     getDataList(seachSelectData.data)
 }
 
@@ -83,11 +79,7 @@ let getDataList = (data) => {
     }
     api.getLists(postData).then(res => {
         if (res.code === 200) {
-            loading.value = true
             dataList.data = res.data.data
-            if(res.data.count<20){
-                loading.value = false
-            }
             if (pages.value === 1) {
                 setInitial()
             }
@@ -95,8 +87,8 @@ let getDataList = (data) => {
             dataList.count = res.data.count
             dataCount.value = res.data.count
             nextTick(() => {
-                pageList['1'].push(dataList.data[0])
-                pageList['2'].push(dataList.data[1])
+                if(dataList.data[0])pageList['1'].push(dataList.data[0])
+                if(dataList.data[1])pageList['2'].push(dataList.data[1])
             })
         } else {
             ElMessage({
@@ -110,9 +102,12 @@ let getDataList = (data) => {
 //添加数据
 let addListData = () => {
     let num = null
-    if (pageList.tab >= (dataList.count>20?20-2:dataList.count-2)) {
-        if(dataList.count>20){
+    if (pageList.tab >= (dataList.count>20?dataList.data.length-2:dataList.count-2)) {
+        console.log(dataList.data.length,20,loading.value)
+        if(dataList.data.length>=20){
             loading.value = true
+        }else{
+            loading.value = false
         }
         return
     }
@@ -134,7 +129,7 @@ let watchImgLoad = (id, listId, height) => {
 //加载更多
 let downLoadMore = () => {
     tool.loadMore(() => {
-        if (!loading.value||dataList.data.length===0) return
+        if (!loading.value) return
         pages.value++
         getDataList(seachSelectData.data)
     })