Merge branch 'dev/1.0.36_zsy' of jianyu/web into feature/v1.0.36

apps/bigmember_pc/src/components/filter-items/Layout.vue

@@ -1,7 +1,7 @@
 <template>
   <div ref="layout" class="filter-layout" :class="{'filter-input-layout': type === 'select'}">
     <el-dropdown
-      :trigger="trigger"
+      trigger="click"
       :placement="placement"
       @visible-change="onVisibleChange"
       ref="dropdownRef"
@@ -16,7 +16,7 @@
         <span class="select-prefix-value" v-else>{{ placeholder }}</span>
         <i class="iconfont icon-xiala" :class="{ 'is-reverse': isFocus, 'highlight-text': value }"></i>
       </div>
-      <el-dropdown-menu v-if="dropdownMenu" slot="dropdown" :append-to-body="false" ref="dropdownMenu">
+      <el-dropdown-menu v-if="dropdownMenu" :class="onlyBottom ? 'fixed-dropdown' : ''" slot="dropdown" :append-to-body="false" ref="dropdownMenu">
         <slot name="empty"></slot>
       </el-dropdown-menu>
     </el-dropdown>
@@ -58,6 +58,11 @@ export default {
     value: {
       type: String,
       default: ''
+    },
+    // dropdown-menu仅在dropdown下方
+    onlyBottom: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -77,6 +82,7 @@ export default {
     onVisibleChange (visible) {
       this.isFocus = visible
       this.$emit('visible', visible)
+
     },
     // 手动触发dropdown展开
     show () {
@@ -91,6 +97,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dropdown-menu.fixed-dropdown{
+    top: 30px !important;
+}
 .filter-layout{
   position: relative;
   ::v-deep{
@@ -103,6 +112,8 @@ export default {
         display: none!important;
       }
     }
+
+
   }
   .is-reverse{
     transform: rotate(180deg);

apps/bigmember_pc/src/views/search/bidding/components/search-bid-filter.vue

@@ -172,7 +172,7 @@ function doChangeFilter() {
 
 <style lang="scss" scoped>
 
-@media (min-width: 1540px) {
+@media (min-width: 1456px) {
   .in-app{
     .search-bid-filter {
       .wrap-line {

apps/bigmember_pc/src/views/search/bidding/constant/search-filters-bi.js

@@ -140,7 +140,7 @@ function createBiSearchBidMoreSchema() {
       }
     },
     {
-      key: 'subType',
+      key: 'subtype',
       label: '信息类型',
       defaultVal: '',
       _name: 'subtype',

apps/bigmember_pc/src/views/search/bidding/constant/search-filters.js

@@ -235,7 +235,7 @@ function createSearchBidBaseSchema(conf = {}) {
 
 function createSearchBidMoreSchema(filterItems, conf) {
   const isLogin = conf.isLogin || false
-  const vipUser = conf.vipUser || false
+  const isVip = conf.isVip || false
   const isBidField = conf.isBidField || false
 
   let SearchBidMoreSchema = [
@@ -248,7 +248,7 @@ function createSearchBidMoreSchema(filterItems, conf) {
       expand: {
         component: RegionSelector,
         props: {
-          vip: vipUser && isLogin,
+          vip: isVip && isLogin,
           showCount: false
         },
         hooks: {

apps/bigmember_pc/src/views/search/bidding/index.vue

@@ -627,9 +627,9 @@ const articleRef = ref({
         margin-top: 6px;
       }
     }
-    .filter-layout{
-      position: unset!important;
-    }
+    //.filter-layout{
+    //  position: unset!important;
+    //}
     .hasNoData_tiptext{
       font-size: 14px;
       font-family: Microsoft YaHei, Microsoft YaHei-Regular;

apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -243,7 +243,8 @@ export default function () {
         showVip: isLogin.value && isInApp.value,
         infoType: infoTypeDataType.value,
         isBidField: isBidField,
-        inInjectBI: inInjectBI
+        inInjectBI: inInjectBI,
+        isVip: isVip.value
       }
     })
 
@@ -1216,7 +1217,7 @@ export default function () {
       doChangeTab({ key})
     } else if(subtype && subtype ==='采购意向' && inBIPropertyIframe) {
       // 物业专版，采购意向回显
-      filterState.value.subType = {采购意向: ['采购意向']}
+      filterState.value.subtype = {采购意向: ['采购意向']}
     }
   }
   /*******工作台跳转end***********/
@@ -1395,21 +1396,20 @@ export default function () {
     if(!searchGroup) {
       restoreListTabActive()
     }
-    // // 恢复上次筛选条件
-    onMounted(() => {
-      if(!inBIPropertyIframe) {
-        getLastFilter()
-      }
-
-      //  P271潜客圈进--客户引流请求
-      if(inputKeywordsState.value.input) {
-        getCustomReportData({ keywords: inputKeywordsState.value.input})
-      }
-    })
-
   }
   initPage()
 
+  // // 恢复上次筛选条件
+  onMounted(() => {
+    if(!inBIPropertyIframe) {
+      getLastFilter()
+    }
+    //  P271潜客圈进--客户引流请求
+    if(inputKeywordsState.value.input) {
+      getCustomReportData({ keywords: inputKeywordsState.value.input})
+    }
+  })
+
 
   return {
     isLogin,

apps/bigmember_pc/src/views/search/bidding/model/modules/filter.js

@@ -60,7 +60,7 @@ export function useSearchFilterModel(conf) {
     // 搜索范围
     selectType: ['title', 'content'],
     // 信息类型
-    subType: {},
+    subtype: {},
     // 发布时间
     publishTime: '',
     // 换手率
@@ -127,9 +127,9 @@ export function useSearchFilterModel(conf) {
   }
   // 格式化物业专版的筛选条件
   function getFormatAPIPropertyParams() {
-    const { publishTime, regionMap, notKey, subType, expireTime } = filterState.value
+    const { publishTime, regionMap, notKey, subtype, expireTime } = filterState.value
     const { area, city } = areaObjTwoToSingle(regionMap)
-    const rSubtype = infoTypeMapFormat(subType)
+    const rSubtype = infoTypeMapFormat(subtype)
     let rPublishTime = ''
     if(publishTime && publishTime.indexOf('-') > -1) {
       const arr =  publishTime.split('-')
@@ -162,7 +162,7 @@ export function useSearchFilterModel(conf) {
       period:  filterState.value.period?.join(),
       propertyForm: filterState.value.propertyForm?.join(),
       selectType: filterState.value.selectType?.join(','),
-      subType: rSubtype,
+      subtype: rSubtype,
       publishTime: rPublishTime ,
       changeHand: filterState.value.changeHand ?  Number(filterState.value.changeHand) : 0,
       fileExists: filterState.value.fileExists,