diff --git a/src/components/seachPage/input.vue b/src/components/seachPage/input.vue
index 99722a1..a9901f5 100644
--- a/src/components/seachPage/input.vue
+++ b/src/components/seachPage/input.vue
@@ -243,11 +243,8 @@ 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
 
@@ -255,11 +252,7 @@ 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') {
@@ -301,13 +294,8 @@ 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