Browse Source

feat:订阅筛选条件调整

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 1 year ago
parent
commit
87cee4d1cf

+ 16 - 0
apps/bigmember_pc/src/assets/js/selector.js

@@ -858,6 +858,22 @@ export const infoSource = [
   }
 ]
 
+// 筛选项-查看状态
+export const viewStatusData = [
+  {
+    value: '',
+    label: '全部'
+  },
+  {
+    value: '0',
+    label: '未查看'
+  },
+  {
+    value: '1',
+    label: '已查看'
+  }
+]
+
 // 筛选项-中标企业联系方式
 export const winnerContactData = [
   {

+ 6 - 7
apps/bigmember_pc/src/components/filter-items/AttachmentSelector.vue

@@ -23,7 +23,6 @@
 
 <script>
 import Layout from '@/components/filter-items/Layout.vue'
-import { attachmentData, infoSource } from '@/assets/js/selector.js'
 export default {
   name: 'Attachment',
   props: {
@@ -43,6 +42,12 @@ export default {
       type: [String, Number, Object],
       default: null
     },
+    options: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     beforeChange: Function
   },
   components: {
@@ -50,7 +55,6 @@ export default {
   },
   data () {
     return {
-      options: attachmentData,
       selected: {
         label: '',
         value: this.value
@@ -66,11 +70,6 @@ export default {
       }
     }
   },
-  created() {
-    if (this.placeholder === '信息来源') {
-      this.options = infoSource
-    }
-  },
   model: {
     prop: 'value',
     event: 'change'

+ 6 - 1
apps/bigmember_pc/src/components/filter-items/KeywordSelector.vue

@@ -39,6 +39,12 @@ export default {
     value: {
       type: Object,
       default: () => {}
+    },
+    options: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   components: {
@@ -53,7 +59,6 @@ export default {
   },
   data() {
     return {
-      options: industryListMapExp,
       selectedVal: []
     }
   },

+ 12 - 8
apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -55,11 +55,7 @@
           @onChange="changeTime"
           selectorType="line"
         >
-          <div
-            class="filter-label"
-            :class="{ 'label-width': showVipTag }"
-            slot="header"
-          >
+          <div class="filter-label" slot="header">
             选择时间:<span
               class="el-icon-jy-vip visibility-hidden"
               v-if="showVipTag"
@@ -624,7 +620,8 @@ export default {
         price: '',
         source: '',
         exportNum: '',
-        district: '' // 区县
+        district: '', // 区县
+        isRead: '' // 查看状态
       },
       showDrawer: false, // 订阅设置弹窗
       chartCustomData: {},
@@ -1626,10 +1623,17 @@ export default {
   background-color: #fff;
 
   ::v-deep {
+    .date-time-container{
+      background-color: transparent;
+    }
+    .selector-card:not(:last-of-type){
+      border-bottom: none;
+    }
     .search-schema-filter-container {
       padding: 0 32px;
     }
     .selector-card.s-line .selector-card-header{
+      margin-right: 12px;
       min-width: 70px;
     }
     .drawer-class {
@@ -1659,7 +1663,7 @@ export default {
     }
 
     .selector-card.s-line {
-      padding: 12px 16px;
+      padding: 12px 32px;
     }
 
     .selector-card.s-line .selector-card-header {
@@ -2063,7 +2067,7 @@ export default {
     justify-content: flex-end;
     font-size: 14px;
     white-space: nowrap;
-    min-width: 70px;
+    width: 70px;
     color: #686868;
   }
 

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

@@ -5,6 +5,7 @@ import RegionSelector from '@/components/filter-items/RegionSelector'
 import AmountRangeSelector from '@/components/filter-items/AmountRangeSelector.vue'
 import AttachmentSelector from '@/components/filter-items/AttachmentSelector.vue'
 import InfoTypeDropdown from '@/components/filter-items/InfoTypeDropdown.vue'
+import { attachmentData, infoSource, viewStatusData } from '@/assets/js/selector.js'
 import SelectorWithBasePower from '@/components/filter-items/SelectorWithBasePower.vue'
 import SearchTimeScopeSelector from '@/components/selector/SearchTimeScopeSelector.vue'
 import $bus from '@/utils/bus'
@@ -18,7 +19,8 @@ const moreFiltersNeedVipKeyList = [
   'price',
   'buyerClass',
   'subtype',
-  'source'
+  'source',
+  'isRead'
 ]
 function noPower() {
   $bus.$emit('search:filter:no-power')
@@ -138,7 +140,10 @@ function createSubscribeMoreSchema() {
       _type: 'component',
       expand: {
         component: AttachmentSelector,
-        hooks: {}
+        hooks: {},
+        props: {
+          options: attachmentData
+        }
       }
     },
     {
@@ -151,10 +156,26 @@ function createSubscribeMoreSchema() {
         component: AttachmentSelector,
         hooks: {},
         props: {
+          options: infoSource,
           placeholder: '信息来源'
         }
       }
     },
+    {
+      key: 'isRead',
+      label: '查看状态',
+      defaultVal: '',
+      _name: 'type',
+      _type: 'component',
+      expand: {
+        component: AttachmentSelector,
+        hooks: {},
+        props: {
+          options: viewStatusData,
+          placeholder: '查看状态'
+        }
+      }
+    }
   ]
 
   SubscribeMoreSchema.forEach((schema) => {