Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/components/seachPage/input.vue

src/components/seachPage/input.vue

@@ -243,7 +243,11 @@ isNeedHousing.value = route.currentRoute.value.query.isNeedHousing === 'true'
 
 //判断当前是什么页面
 let houseingPageType = sessionStorage.getItem('houseingPageType')
+<<<<<<< HEAD
 console.log('houseingPageType', houseingPageType)
+=======
+// console.log('houseingPageType',houseingPageType)
+>>>>>>> origin/main
 let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment'
 tabType.value = type
 
@@ -251,7 +255,11 @@ tabType.value = type
 let checkPageType = () => {
     // houseingPageType 0个人 1中介 6求房源
     let type = houseingPageType === '0' ? 'person' : houseingPageType === '1' ? 'intermediary' : houseingPageType === '6' ? 'need' : 'apartment'
+<<<<<<< HEAD
     console.log('type', type)
+=======
+    // console.log('type',type)
+>>>>>>> origin/main
     tabType.value = type
     seachAllType['tabType'] = type
     if (type === 'person') {
@@ -293,8 +301,13 @@ if (isNeedHousing.value) {
 
 //设置搜索数据
 let setSeachConditions = (type, data) => {
+<<<<<<< HEAD
     console.log(1, seachAllType)
     console.log(type.value)
+=======
+    // console.log(1,seachAllType)
+    // console.log(type.value)
+>>>>>>> origin/main
     if (seachAllType['tabType'] !== 'apartment') {
         if (type === 'rent') {
             seachAllType['rent_min'] = data.min