Merge remote-tracking branch 'origin/main'

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

src/components/seachPage/input.vue

@@ -18,7 +18,7 @@
                         <img src="../../assets/homeImage/Mycollect.png" class="img" alt="">
                         我的收藏
                     </div>
-                    <div class="tool-btn dis-f al-item jus-x mg-l-10" @click="gouser('fav')">
+                    <div class="tool-btn dis-f al-item jus-x mg-l-10" @click="gouser('publish')">
                         <img src="../../assets/homeImage/informationO.png" class="img" alt="">
                         我的发布
                     </div>
@@ -74,7 +74,8 @@
                         中介房源 {{ seachKey.key && seachKey.key.intermediary && seachKey.key.intermediary.count }}
                     </div>
                     <div class="top-btn dis-f jus-x al-item third" @click="selectPage('apartment')"
-                        :class="{ 'select-top-btn-bg': tabType === 'apartment' }" v-if="!isNeedHousing&&houseingPageType!=6">
+                        :class="{ 'select-top-btn-bg': tabType === 'apartment' }"
+                        v-if="!isNeedHousing && houseingPageType != 6">
                         <div class="second-select-third-box" v-show="tabType === 'intermediary'">
                             <div class="box">
 
@@ -242,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
 
@@ -250,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') {
@@ -292,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
@@ -438,7 +452,13 @@ defineExpose({
 })
 
 // 跳转我的页面
-const gouser = tab => route.push(`/user?tab=${tab}`)
+const gouser = tab => {
+    if (!store.state['user']['uid']) {
+        store.state.showloginmodal = true
+        return
+    }
+    route.push(`/user?tab=${tab}`)
+}
 
 </script>
 <style scoped>