Merge remote-tracking branch 'origin/main'

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

src/components/biserialListItem/biserialListItem.vue

@@ -78,6 +78,7 @@
                         }}]</span>
                     </div>
                 </div>
+                <!-- 'img-150':routePath==='/detail' -->
                 <div class="img">
                     <div class="dis-f">
                         <img :src="data && data.data && data.data.ispic ? data && data.data.imageurl : data && data.data && data.data.isvideo ? data && data.data && data.data.imageurl : ''"
@@ -150,7 +151,6 @@ let listId = props.listId
 let imgRef = null
 let loadFinish = () => {
     let height = imgRef.ctx.$refs && imgRef.ctx.$refs.list && imgRef.ctx.$refs.list.offsetHeight
-    // console.log(data.id, listId, height)
     props.imgLoad(data.id, listId, height)
 }
 
@@ -280,6 +280,10 @@ img {
         margin-top: 20px;
     }
 
+    .img-150{
+        width:150px !important;
+    }
+
     .img {
         width: 100px;
         object-fit: cover;

src/components/seachModule/seachModule.vue

@@ -229,7 +229,6 @@ let setHotSeach = (item) => {
 
 //点击选项
 let checkBtn = (data, type, areaItem) => {
-    // console.log(data, type, areaItem)
     getDataList(type, data, areaItem)
 }
 

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

src/components/selectTabBox/selectTabBox.vue

@@ -598,7 +598,7 @@ let getAddressListId = (id, type) => {
 
 //查找出租类型
 let getHireType = (data, id) => {
-    console.log(data)
+    // console.log(data)
     let obj = null
     data.map(res => {
         if (res.id == id) obj = res
@@ -700,7 +700,7 @@ watchEffect(() => {
     if (configData.data) {
         hireTypeArr[1].hireType = setHireTypeArr(store.state.seachTypeData[2] ? store.state.seachTypeData[2].where[0].data : [], 1)
         hireTypeArr[2].hireType = setHireTypeArr(store.state.seachTypeData[2] ? store.state.seachTypeData[2].where[1].data : [], 2)
-        console.log('route', route)
+        // console.log('route', route)
         if (setRouterQuerySet.value) {
             setRegionList()//设置地区数据
             setSchoolData()//设置学校数据