Ver código fonte

feat: 监控问题处理

zhangyuhan 1 ano atrás
pai
commit
4e048ccbc9

+ 16 - 0
apps/bigmember_pc/src/composables/quick-monitor/use/client.js

@@ -91,9 +91,25 @@ function useClientQuickMonitorModel({ type, id }) {
     const store = useStore()
     return store.getters['user/entniche'] || store.getters['user/bigmember']
   })
+  const IsFreeUser = computed(() => {
+    const store = useStore()
+    return store.getters['user/isFree']
+  })
   const loading = ref(false)
   const { model, doChange, doFetch, getId } = useMonitorModel({ type, id })
   const monitorPopoverConfig = computed(() => {
+    // 历史业务逻辑,免费用户不显示查看监控列表、详情
+    if (!model.value.follow && IsFreeUser.value) {
+      return {
+        showTip: !model.value.follow,
+        showMore: false,
+        showList: false,
+        showCancel: model.value.follow,
+        alreadyNum: model.value.expands.used,
+        remainNum: model.value.expands.surplus,
+        textType: type
+      }
+    }
     return {
       showTip: !model.value.follow,
       showMore: model.value.follow,

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

@@ -87,9 +87,9 @@ function useEntQuickMonitorModel({ type, id }) {
   const collectElement = ref(null)
   const { dialogConfig, doOpenDialog, doCloseDialog } =
     useMonitorTipDialog(DialogDataMap)
-  const HasPowerBigmemberOrEnt = computed(() => {
+  const IsFreeUser = computed(() => {
     const store = useStore()
-    return store.getters['user/entniche'] || store.getters['user/bigmember']
+    return store.getters['user/isFree']
   })
   const loading = ref(false)
   const { model, doChange, doFetch, getId } = useMonitorModel({ type, id })
@@ -149,12 +149,12 @@ function useEntQuickMonitorModel({ type, id }) {
           } else {
             // 判断是否超出可监控项目个数
             if (res.data?.limit_count) {
-              if (HasPowerBigmemberOrEnt.value) {
+              if (IsFreeUser.value) {
+                return doOpenCollectDialog('pc_article_ent_limit')
+              } else {
                 return doOpenDialog('max-monitor', {
                   count: res.data?.limit_count
                 })
-              } else {
-                return doOpenCollectDialog('pc_article_ent_limit')
               }
             }
             that.$toast(res.msg)
@@ -206,10 +206,10 @@ function useEntQuickMonitorModel({ type, id }) {
         doOpenDialog('cancel-monitor')
         break
       case 'apply':
-        if (HasPowerBigmemberOrEnt.value) {
-          doOpenDialog('apply-monitor')
-        } else {
+        if (IsFreeUser.value) {
           doOpenCollectDialog('pc_article_ent_more')
+        } else {
+          doOpenDialog('apply-monitor')
         }
         break
       case 'more':

+ 2 - 2
apps/bigmember_pc/src/views/project/ProjectInfo.vue

@@ -102,8 +102,8 @@
             <div class="action-follow m-right-12" @click="clickFollowButton">
               <span
                 :class="{
-                  'el-icon-jy-heart_solid': projectContent.isfollow,
-                  'el-icon-jy-heart_stroke': !projectContent.isfollow
+                  'iconfont icon-yijiankong': projectContent.isfollow,
+                  'iconfont icon-jiankong': !projectContent.isfollow
                 }"
               ></span>
               <span class="text">{{