Merge branch 'main' into feature/v1.0.56

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

@@ -176,7 +176,6 @@ export default {
       const containerWidth = document.querySelector('.select-list').clientWidth - 72 - 50 // 容器的宽度
       const itemWidth = 50
       this.oneShowCount = Math.floor(containerWidth / itemWidth)
-      console.log(this.oneShowCount, '一行展示多少个')
     },
     toggleMoreStatus() {
       this.moreStatus = !this.moreStatus

apps/bigmember_pc/src/components/push-list/PushList.vue

@@ -868,57 +868,44 @@ export default {
         Object.keys(this.getFilters).forEach((v) => {
           if (typeof this.getFilters[v] !== 'undefined') {
             if (v === 'industry' && typeof filters[v] === 'object') {
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(this.getFilters[v]).join(',')
-              } else {
-                query[v] = ''
               }
             } else if (v === 'buyerClass' && typeof filters[v] === 'object') {
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(this.getFilters[v]).map((v) => v.split('_')[1]).join(',')
-              } else {
-                query[v] = ''
               }
             } else if (v === 'subtype' && typeof filters[v] === 'object') {
               const filterSubtype = InfoTypeTransform.mapToList(this.getFilters[v])
-              if(this.getFilters[v].length > 0) {
+              if(Object.keys(this.getFilters[v]).length > 0) {
                 query[v] = filterSubtype.length > 0 ? filterSubtype.join(',') : ''
-              } else {
-                query[v] = ''
               }
             } else {
               query[v] = this.getFilters[v]
             }
-            // query[v] = this.getFilters[v]
           }
         })
       }
       if (filters && Object.keys(filters).length > 0) {
+        console.log(filters, 'filters')
         Object.keys(filters).forEach((v) => {
           if (typeof filters[v] !== 'undefined') {
             if (v === 'industry' && typeof filters[v] === 'object') {
-              if(filters[v].length > 0) {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(filters[v]).join(',')
-              } else {
-                query[v] = ''
               }
-            } else if (v === 'buyerClass'  && typeof filters[v] === 'object') {
-              if(filters[v].length > 0) {
+            } else if (v === 'buyerClass' && typeof filters[v] === 'object') {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = this.formatIndustryMap(filters[v]).map((v) => v.split('_')[1]).join(',')
-              } else {
-                query[v] = ''
               }
-            } else if (v === 'subtype'  && typeof filters[v] === 'object') {
+            } else if (v === 'subtype' && typeof filters[v] === 'object') {
               const filterSubtype = InfoTypeTransform.mapToList(filters[v])
-              if(filters[v].length > 0) {
+              if(Object.keys(filters[v]).length > 0) {
                 query[v] = filterSubtype.length > 0 ? filterSubtype.join(',') : ''
-              } else {
-                query[v] = ''
               }
             } else {
               query[v] = filters[v]
             }
-            // query[v] = filters[v]
           }
         })
       }
@@ -927,7 +914,6 @@ export default {
         query.isEnt = true
       }
       // delete query.item  所有订阅列表都增加item参数
-  
       return query
     },
     async getList(filters) {

apps/bigmember_pc/src/components/selector/TimeSelectorContent.vue

@@ -37,6 +37,7 @@
           :start-placeholder="dateTimePickerState.startPlaceHolder"
           :end-placeholder="dateTimePickerState.endPlaceHolder"
           :append-to-body="false"
+          :placement="placement"
           @change="onDateRangeChange"
         >
         </el-date-picker>
@@ -53,6 +54,7 @@
           :placeholder="dateTimePickerState.startPlaceHolder"
           :picker-options="startPickerOptions"
           :append-to-body="false"
+          :placement="placement"
           @change="startDatePickerChange"
           @focus="showConfirmHandle"
         >
@@ -68,6 +70,7 @@
           :placeholder="dateTimePickerState.endPlaceHolder"
           :picker-options="endPickerOptions"
           :append-to-body="false"
+          :placement="placement"
           @change="endDatePickerChange"
           @focus="showConfirmHandle"
         >
@@ -394,6 +397,10 @@ export default {
     isDateRange: {
       type: Boolean,
       default: false
+    },
+    placement: {
+      type: String,
+      default: 'bottom-start'
     }
   },
   data() {
@@ -467,9 +474,6 @@ export default {
       this.dateTimePickerState.end = value[1]
       this.setTimeSelectListState()
       this.onChange()
-      // if(this.showConfirmButton) {
-      //   this.showConBtn = true
-      // }
     },
     calcTimeSelectList() {
       let timeSelectList = []
@@ -543,7 +547,6 @@ export default {
             this.timeSelectList.forEach((v) => (v.selected = false))
             this.dateTimePickerState.start = data.start ? new Date(data.start) : null
             this.dateTimePickerState.end =data.end ?  new Date(data.end) : null
-            // 
             this.dateTimeRangeState = [data.start, data.end]
             break
           }
@@ -610,6 +613,7 @@ export default {
     clearDateTimePicker() {
       this.dateTimePickerState.start = ''
       this.dateTimePickerState.end = ''
+      this.dateTimeRangeState = []
     },
     // 计算lately7/lately30/lastYear等的开始和结束时间
     // endTime传入一个时间戳

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

@@ -48,7 +48,7 @@ function createBiSearchBidBaseSchema(propertyListData = {}) {
           type: 'expire',
           showConfirmButton: true,
           exactCanHalf: true,
-          isDateRang: true
+          isDateRange: true
         },
         hooks: {}
       }

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

@@ -640,7 +640,9 @@ const articleRef = ref({
     }
     .el-date-editor.el-input,
     .el-date-editor.el-input__inner{
-      width: 228px;
+      width: unset;
+      background: transparent;
+      padding: 0;
     }
   }
   .over-run-tips {

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

@@ -320,18 +320,18 @@ export default function () {
     }
     const seoUrl = `/qy/${seoId}.html${BIPage}`
     const url = `/swordfish/page_big_pc/free/loading/ent/${encodeURIComponent(id)}`
+    // 渠道合作投放用户（匿名用户）不能查看画像 提示登录
     if (cooperateCode.value) {
       return goLogin()
+    }
+    if (!isLogin.value) {
+      window.open(seoUrl)
     } else {
       saveViewHistoryQuery({
         type: 'ent',
         name: `${name}_${id}`
       })
-      if (!isLogin.value) {
-        window.open(seoUrl)
-      } else {
-        window.open(url)
-      }
+      window.open(url)
     }
   }
 

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

@@ -266,14 +266,14 @@ export default function () {
     }
     const seoUrl = `/dw/${seo_id}.html${BIPage}`
     const url = `/swordfish/page_big_pc/free/loading/buyer/${buyer}`
+    // 渠道合作投放用户（匿名用户）
     if (cooperateCode.value) {
       return goLogin()
+    }
+    if (!isLogin.value) {
+      window.open(seoUrl)
     } else {
-      if (!isLogin.value) {
-        window.open(seoUrl)
-      } else {
-        window.open(url)
-      }
+      window.open(url)
     }
   }
   /**

apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -644,14 +644,6 @@ export default {
           this.filters.item = this.convertArrayToObject(oneAndtwo)
           this.filters.keyWords = two_noall.join(',')
         } else {
-          // if (one_noall.length) {
-          //   this.filters.item = {}
-          //   one_noall.forEach((s) => {
-          //     this.filters.item[s] = []
-          //   })
-          // } else {
-          //   this.filters.item = {}
-          // }
           this.filters.item = {}
           this.filters.keyWords = ''
         }

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

@@ -31,6 +31,7 @@ const moreFiltersNeedVipKeyList = [
 function createSubscribeMoreSchema(conf = {}) {
   const vt = conf.vt.value || 'f'
   const isFree = conf.isFree.value || false
+  const isSubCount = conf.isSubCount.value || false
   let SubscribeMoreSchema = [
     {
       key: 'keyWords',
@@ -180,7 +181,7 @@ function createSubscribeMoreSchema(conf = {}) {
       }
     }
   ]
-  if (!isFree) {
+  if (!isFree && !isSubCount) {
     const insertPosition = SubscribeMoreSchema.length - 1
     SubscribeMoreSchema.splice(
       insertPosition,

apps/bigmember_pc/src/views/subscribe/model/base.js

@@ -7,6 +7,10 @@ function moreFiltersNeedVipKeyList() {
   const isFree = computed(() => {
     return useStore().getters['user/isFree']
   })
+  //是否是大会员子账号
+  const isSubCount = computed(() => {
+    return useStore().getters['user/isSubCount']
+  })
   // 是否是企业版
   const isEntSubscribe = computed(() => {
     return useStore().getters['user/isEntSubscribe']
@@ -34,6 +38,7 @@ function moreFiltersNeedVipKeyList() {
     return {
       vt,
       isFree,
+      isSubCount,
       isEntSubscribe,
       isLogin,
       userPowerInfo