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

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

@@ -80,8 +80,7 @@ function noPower() {
 }
 
 function toLogin() {
-  console.log('need login')
-  $bus.$emit('common:login:to-login')
+  $bus.$emit('bidding:goLogin')
 }
 
 function doChangeFilter() {

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

@@ -16,6 +16,32 @@ function noPower() {
   $bus.$emit('search:filter:no-power')
 }
 
+function beforeChangeHandle ($event, char) {
+  // 发布时间
+  if(char === 'publishTime') {
+    if($event.value === 'sinceLastYear') {
+      return true
+    } else {
+      $bus.$emit('bidding:goLogin')
+      return false
+    }
+  } else if(char === 'selectType') {
+    if($event.value === 'file') {
+      $bus.$emit('bidding:goLogin')
+      return false
+    } else {
+      return true
+    }
+  } else if (char === 'subtype') {
+    if($event.value) {
+      $bus.$emit('bidding:goLogin')
+    } else {
+      return true
+    }
+  }
+}
+
+
 // 更多筛选中需要vip的筛选项
 const moreFiltersNeedVipKeyList = [
   'buyerclass',
@@ -44,6 +70,9 @@ function createSearchBidBaseSchema(conf = {}) {
       vipMaskShow: true,
       vipModuleShow: showVip,
       freeConf: {
+        beforeChange ($event) {
+          return beforeChangeHandle($event, 'publishTime')
+        },
         options: ['lately7', 'lately30', 'sinceLastYear'],
       },
       vipConf: {
@@ -71,6 +100,9 @@ function createSearchBidBaseSchema(conf = {}) {
       component: SearchScopeSelector,
       options: defaultScopeOptions,
       freeConf: {
+        beforeChange($event) {
+          return beforeChangeHandle($event, 'selectType')
+        },
         options: freeOptions,
       },
       vipConf: {
@@ -118,7 +150,10 @@ function createSearchBidBaseSchema(conf = {}) {
         props: {
           showLabel: false,
           selectorType: 'line',
-          showDataType: infoType
+          showDataType: infoType,
+          beforeChange ($event) {
+            return beforeChangeHandle($event, 'subtype')
+          },
         },
         hooks: {}
       }

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

@@ -68,8 +68,8 @@ export default function () {
 
 
   // 是否在工作台内
-  const isInApp = ref(true) || ref(InContainer.inApp)
-  const isInWeb = ref(false) || ref(InContainer.inWeb)
+  const isInApp = ref(InContainer.inApp)
+  const isInWeb = ref(InContainer.inWeb)
 
   // 是否是渠道商
   const cooperateCode = ref(false)

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

@@ -73,7 +73,16 @@ export function useSearchFilterModel(conf) {
   }
 
   function getFormatAPIParams() {
-    const { publishTime, regionMap, industry, notkey, buyerclass, subtype } = filterBase.value
+    if(!inBIPropertyIframe) {
+     return getFormatApiBaseParams()
+    } else {
+      return getFormatAPIPropertyParams()
+    }
+
+  }
+  // 格式化招标采购基础筛选条件
+  function getFormatApiBaseParams () {
+    const { publishTime, regionMap, industry, notkey, buyerclass, subtype } = filterState.value
     const { area, city, district } = FilterHistoryViewModel2AjaxModel.formatAreaCity(regionMap)
     const rPublishTime = publishTime?.indexOf('_') > -1 ? publishTime.replace(/_/g, '-') :  FilterHistoryViewModel2AjaxModel.formatTime(publishTime, true, '-')
     const rIndustry = FilterHistoryViewModel2AjaxModel.formatIndustry(industry)
@@ -81,27 +90,27 @@ export function useSearchFilterModel(conf) {
     const rSubtype = FilterHistoryViewModel2AjaxModel.formatInfoType(subtype)
     const params = {
       publishTime: rPublishTime,
-      selectType: filterBase.value.selectType.join(','),
+      selectType: filterState.value.selectType.join(','),
       subtype: rSubtype,
       exclusionWords: notkey.join(','), // 排除词
-      buyer: filterBase.value.buyer.join(','),
-      winner: filterBase.value.winner.join(','),
-      agency: filterBase.value.agency.join(','),
+      buyer: filterState.value.buyer.join(','),
+      winner: filterState.value.winner.join(','),
+      agency: filterState.value.agency.join(','),
       industry: rIndustry,
       province: area,
       city,
       district,
       buyerClass: rBuyerClass,
-      fileExists: filterBase.value.fileExists,
-      price: filterBase.value.price,
-      buyerTel: filterBase.value.buyertel,
-      winnerTel: filterBase.value.winnertel
+      fileExists: filterState.value.fileExists,
+      price: filterState.value.price,
+      buyerTel: filterState.value.buyertel,
+      winnerTel: filterState.value.winnertel
     }
     return params
   }
-
+  // 格式化物业专版的筛选条件
   function getFormatAPIPropertyParams() {
-    return filterProperty.value
+    return filterState.value
   }
 
   return {