增加加载提示语 添加搜索同步url 修改搜索页搜索类型显示

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);
 })