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

src/views/seachIndex.vue

@@ -24,6 +24,7 @@
             </div>
         </div>
         <listBtmPrompt></listBtmPrompt>
+        <footerTool></footerTool>
     </div>
 </template>
   
@@ -40,6 +41,7 @@ import apartmentItem from '@/components/public/apartment-item.vue';
 import Masonry from 'masonry-layout';
 import { useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus'
+import footerTool from '@/components/footer/footer.vue'
 
 //路由
 const route = useRouter()
@@ -99,11 +101,7 @@ let getDataList = (data) => {
     seachApi.then(res => {
         if (res.code === 200) {
             console.log(res.data)
-            loading.value = true
             dataList.data = res.data.data
-            if (res.data.count < 20) {
-                loading.value = false
-            }
             if (seachSelectData.data.tabType !== 'apartment') {
                 if (pages.value === 1) {
                     setInitial()
@@ -112,8 +110,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 {
                 let data = res.data
@@ -137,10 +135,11 @@ let getDataList = (data) => {
 //添加数据
 let addListData = () => {
     let num = null
-    console.log(pageList.tab , dataList.count)
-    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)) {
+        if(dataList.data.length>=20){
             loading.value = true
+        }else{
+            loading.value = false
         }
         return
     }