Эх сурвалжийг харах

Merge branch 'dev/v1.0.53.1_tsz' of jianyu/web into hotfix/v1.0.53.1

汤世哲 11 сар өмнө
parent
commit
37a3d973b3

+ 2 - 1
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,

+ 5 - 0
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