首页跳转个人房源

src/views/housingView/intermediary.vue

@@ -62,6 +62,8 @@ let setInitial = () => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    if(!loading.value)return
+    loading.value = false
     let postData = {
         page: pages.value,
         intermediary:1,
@@ -94,7 +96,10 @@ let getDataList = (data) => {
 //添加数据
 let addListData = () => {
     let num = null
-    if (pageList.tab >= 18) return
+    if (pageList.tab >= 18){
+        loading.value = true
+        return
+    } 
     pageList.tab++
     if (pageList.height1 > pageList.height2) {
         num = 2
@@ -113,7 +118,7 @@ let watchImgLoad = (id, listId, height) => {
 //加载更多
 let downLoadMore = () => {
     tool.loadMore(() => {
-        if (!loading.value) return
+        if (!loading.value||dataList.data.length===0) return
         pages.value++
         getDataList(seachSelectData.data)
     })

src/views/housingView/needHousing.vue

@@ -68,6 +68,8 @@ let setInitial = () => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    if(!loading.value)return
+    loading.value = false
     let postData = {
         page: pages.value,
         intermediary:0,
@@ -100,7 +102,10 @@ let getDataList = (data) => {
 //添加数据
 let addListData = () => {
     let num = null
-    if (pageList.tab >= 18) return
+    if (pageList.tab >= 18){
+        loading.value = true
+        return
+    } 
     pageList.tab++
     if (pageList.height1 > pageList.height2) {
         num = 2
@@ -119,7 +124,7 @@ let watchImgLoad = (id, listId, height) => {
 //加载更多
 let downLoadMore = () => {
     tool.loadMore(() => {
-        if (!loading.value) return
+        if (!loading.value||dataList.data.length===0) return
         pages.value++
         getDataList(seachSelectData.data)
     })

src/views/housingView/person.vue

@@ -32,6 +32,11 @@ import listBtmPrompt from "../../components/public/have-questions.vue";
 import noList from "../../components/public/empty-duck.vue";
 import api from "../../utils/api";
 import tool from '../../toolJs/downLoadMore'
+import { useRouter } from 'vue-router'
+
+//路由
+const router = useRouter()
+
 
 //获取数据
 let pages = ref(1)
@@ -39,7 +44,7 @@ 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)
 
 //保存搜索设置
@@ -63,6 +68,8 @@ let setInitial = () => {
 
 //获取搜索数据
 let getDataList = (data) => {
+    if(!loading.value)return
+    loading.value = false
     let postData = {
         page: pages.value,
         intermediary:0,
@@ -70,7 +77,6 @@ let getDataList = (data) => {
     }
     api.getLists(postData).then(res => {
         if (res.code === 200) {
-            loading.value = true
             dataList.data = res.data.data
             if (res.data.data.length === 0) {
                 loading.value = false
@@ -95,7 +101,10 @@ let getDataList = (data) => {
 //添加数据
 let addListData = () => {
     let num = null
-    if (pageList.tab >= 18) return
+    if (pageList.tab >= 18){
+        loading.value = true
+        return
+    } 
     pageList.tab++
     if (pageList.height1 > pageList.height2) {
         num = 2
@@ -114,7 +123,8 @@ let watchImgLoad = (id, listId, height) => {
 //加载更多
 let downLoadMore = () => {
     tool.loadMore(() => {
-        if (!loading.value) return
+
+        if (!loading.value||dataList.data.length==0) return
         pages.value++
         getDataList(seachSelectData.data)
     })
@@ -122,7 +132,12 @@ let downLoadMore = () => {
 
 //listImg
 onMounted(() => {
-    getDataList()
+    console.log(router.params)
+    console.log(router.currentRoute.value.query)
+    if(Object.keys(router.currentRoute.value.query).length>0){
+        seachSelectData.data={...router.currentRoute.value.query}
+    }
+    getDataList(seachSelectData.data)
     window.addEventListener('scroll', downLoadMore, true);
 })