提交

src/components/apartment/seachModule.vue

@@ -225,7 +225,7 @@ const selectOption = (type, value) => {
             break;
     }
 
-    console.log(pitchValue.value);
+    // console.log(pitchValue.value);
     emit('handleTransfer', pitchValue)
 
 }

src/views/housingView/apartment.vue

@@ -55,38 +55,40 @@ onUnmounted(() => {
     window.removeEventListener('scroll', handleScroll);
 });
 
-let loading = ref(null) // 加载
+let loading = null // 加载
+let requestLoading = false // 接口加载中
 let page = 1
 const getData = () => {
-
+    if (page == 0 || requestLoading) return
-    if (page == 0 || loading['visible']) return
-
-
     loading = ElLoading.service({
         lock: true,
         text: 'Loading',
         background: 'rgba(0, 0, 0, 0.7)',
     })
+    requestLoading = true
 
-    proxy.$post("/tenement/pc/api/apartment", {
+    proxy.$get("/tenement/pc/api/apartment", {
-        page
+        page,
+        ...pitchValue
     }).then(res => {
         if (res.code != 200) return
         let data = res.data
         list.value = list.value.concat(data.data)
-        page = data.page * data.limit >= data.count ? 0 : page + 1,
+        page = data.page * data.limit >= data.count ? 0 : page + 1
-            nextTick(() => {
+        nextTick(() => {
-                masonryInstance.reloadItems();
+            masonryInstance.reloadItems();
-                masonryInstance.layout();
+            masonryInstance.layout();
-                loading.close()
+            loading.close()
-            })
+            requestLoading = false
+        })
+
     }).catch(err => {
         loading.close()
+        requestLoading = false
     })
 
 }
 
-
 const handleScroll = () => {
     const scrollHeight = document.documentElement.scrollHeight;
     const clientHeight = document.documentElement.clientHeight;
@@ -100,9 +102,16 @@ const handleScroll = () => {
     }
 };
 
+let pitchValue = {}
+
 // 筛选组件的参数的中转
 const handleTransfer = (data) => {
-    console.log("data", data);
+    // console.log("data", data.value);
+    pitchValue = { ...data.value }
+    // console.log("data", pitchValue);
+    page = 1
+    list.value = []
+    getData()
 }
 
 </script>