Merge remote-tracking branch 'origin/main'

src/components/detail/imageWatch.vue

@@ -78,7 +78,7 @@ let imageTab = ref(0)
 let prev = () => carousel.value.prev()
 
 // 轮播图滚动后事件
-const carouselChange = value => imageTab.value = value
+const carouselChange = value =>{ imageTab.value = value;console.log(value)}
 
 //下一张
 let next = () => carousel.value.next()

src/components/seachPage/input.vue

@@ -232,6 +232,7 @@ let selectPage = (type) => {
         seachAllType['isverified'] = 0
         seachAllType['isintermediary'] = 0
     }
+    if ((seachVal.value && !setPageKey()))return
     getDataList(seachAllType)
 }
 
@@ -320,12 +321,12 @@ let setSeachConditions = (type, data) => {
         }
     } else {
         seachAllType = {
-            tabType:'apartment',
-            searchid:setPageKey(),
+            tabType: 'apartment',
+            searchid: setPageKey(),
             ...type.value
         }
     }
-    if(!seachAllType['tabType'])seachAllType['tabType']=tabType.value
+    if (!seachAllType['tabType']) seachAllType['tabType'] = tabType.value
     if (!seachVal.value) {
         seachAllType.searchid = ''
     }