Merge branch 'dev/v1.0.88_yf' of jianyu/web into feature/v1.0.88

apps/bigmember_pc/src/composables/quick-monitor/component/MonitorGroup.vue

@@ -44,18 +44,6 @@ watch(
   }
 )
 
-// function inputCountHighLight() {
-//   const countElement = document.querySelector('.el-input__count')
-//   const countHtml = document.querySelector('.el-input__count > .el-input__count-inner')
-//   if(countElement && countHtml) {
-//     const str = countHtml.textContent
-//     const regex = /(\d+)\/(\d+)/
-//     let newStr = str.replace(regex, '<em class="highlight">$1</em>/$2');
-//     countHtml.textContent = newStr
-//     countElement.appendChild(countHtml)
-//   }
-// }
-
 function initData() {
   if (!props.list || !props.list.length) return
   const formatList = props.list.map((v) => {

apps/bigmember_pc/src/composables/quick-monitor/use/ent.js

@@ -110,6 +110,10 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
     const store = useStore()
     return store.getters['user/isFree']
   })
+  const IsSVipUser = computed(() => {
+    const store = useStore()
+    return store.getters['user/isSuper']
+  })
   const loading = ref(false)
   const { model, doChange, doFetch, getId, doFetchGroup, groupList }
     = useMonitorModel({ type, id }, options)
@@ -147,7 +151,7 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
       }
       else {
         if (res.data?.limit_count) {
-          if (IsFreeUser.value) {
+          if (IsFreeUser.value || IsSVipUser.value) {
             return doOpenCollectDialog(limitSource || 'pc_article_ent_limit')
           }
           else {
@@ -209,7 +213,7 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
         }
         else {
           if (res.data?.limit_count) {
-            if (IsFreeUser.value) {
+            if (IsFreeUser.value || IsSVipUser.value) {
               return doOpenCollectDialog(limitSource || 'pc_article_ent_limit')
             }
             else {
@@ -264,7 +268,7 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
         doOpenDialog('cancel-monitor')
         break
       case 'apply':
-        if (IsFreeUser.value) {
+        if (IsFreeUser.value || IsSVipUser.value) {
           doOpenCollectDialog(moreSource || 'pc_article_ent_more')
         }
         else {
@@ -306,7 +310,7 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
             else {
               // 判断是否超出可监控项目个数
               if (res.data?.limit_count) {
-                if (IsFreeUser.value) {
+                if (IsFreeUser.value || IsSVipUser.value) {
                   return doOpenCollectDialog('pc_article_ent_limit')
                 }
                 else {