Merge remote-tracking branch 'origin/main'

src/views/housingView/apartment.vue

@@ -65,7 +65,6 @@ onMounted(() => {
     });
 
     if (route.query['companyid']) pitchValue['companyid'] = route.query['companyid']
-
     getData()
 
     window.addEventListener('scroll', handleScroll);
@@ -119,23 +118,25 @@ const handleScroll = () => {
     if (scrollTop + clientHeight >= scrollHeight - 350) getData()
 };
 
-let pitchValue = {}
+let pitchValue = {
+    companyid: 0,
+    roomtype: 0,
+    rent_min: null,  // 租金
+    rent_max: null,  // 租金
+    school: 0,
+    roomlistings: 0,
+    keyword: "",
+}
 
 // 筛选组件的参数的中转
 const handleTransfer = (data) => {
     for (const key in data.value) {
         if (data.value[key] != pitchValue[key]) {
             pitchValue = { ...data.value }
-
-            for (const key in pitchValue) {
-                if (pitchValue[key]) {
-                    page = 1
-                    list.value = []
-                    getData()
-                    break
-                }
-            }
-
+            page = 1
+            list.value = []
+            getData()
+            break
         }
     }
 }