Merge remote-tracking branch 'origin/main'

src/components/seachModule/seachModule.vue

@@ -185,7 +185,7 @@ let seachList = (item) => {
 }
 
 //设置搜索数据
-let setSeachConditions = (type, data) => {
+let setSeachConditions = (type, data,second) => {
     if (type === 'rent') {
         seachAllType['rent_min'] = data.min
         seachAllType['rent_max'] = data.max

src/components/selectTabBox/selectTabBox.vue

@@ -680,6 +680,7 @@ let routerQuerySet = () => {
             if(deconstructionSeachData.selectData[0])
             nextTick(() => {
                 setCheckBoxData(deconstructionSeachData.selectData)//设置地区选项
+                
             })
         }
     }

src/views/detail.vue

@@ -1,10 +1,10 @@
 <template>
     <div>
         <pageTopBar></pageTopBar>
-        <div class="dis-f jus-x al-item"
+        <div class="dis-f jus-x al-item">
-            :class="{ 'mg-b-80': pageType == 3 || (recommendListData.length == 0 || publisherList.length == 0) }">
             <div class="body-maxWidth mg-t-35">
                 <breadcrumb :data="housingInfo['data']" :operation='setOperation'></breadcrumb>
+                {{ pageType == 3 || (recommendListData.length == 0 || publisherList.length == 0) }}
                 <el-affix :offset="0" @change="changeTitleType" z-index="700">
                     <div class="top-bar-box dis-f jus-x" v-show="titleType">
                         <div class="top-bar dis-f al-item jus-bet">
@@ -748,7 +748,7 @@
             v-if="pageType != 3 && (recommendListData.length > 0 || publisherList.length > 0)">
             - {{ loadText }} -
         </div>
-        <footerTool></footerTool>
+        <footerTool class="mg-t-60"></footerTool>
         <div class="pop-box" v-show="showConcat">
             <!-- 两种信息 -->
             <!-- third-concat -->
@@ -1441,8 +1441,8 @@ img {
     position: absolute;
 }
 
-.mg-b-80 {
+.mg-t-60 {
-    margin-bottom: 80px;
+    margin-top: 60px;
 }
 
 .housing-title {