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

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

@@ -201,31 +201,37 @@ function useEntQuickMonitorModel({ type, id, source }, options) {
    * @return {Promise<void>}
    */
   async function doAddFollow() {
+    console.log(loading.value, model.value.follow, 'follow')
     if (loading.value)
       return
     loading.value = true
     // 业务流程
     if (!model.value.follow) {
       // 先弹出选择分组弹框
-      await doFetchGroup({ type: 'get' }).then((res) => {
-        if (res.success) {
-          doOpenDialog('monitor-group', { groupList: res.data })
-        }
-        else {
-          if (res.data?.limit_count) {
-            if (IsFreeUser.value || IsSVipUser.value) {
-              return doOpenCollectDialog(limitSource || 'pc_article_ent_limit')
-            }
-            else {
-              return doOpenDialog('max-monitor', {
-                count: res.data?.limit_count
-              })
+      await doFetchGroup({ type: 'get' })
+        .then((res) => {
+          if (res.success) {
+            doOpenDialog('monitor-group', { groupList: res.data })
+          }
+          else {
+            if (res.data?.limit_count) {
+              if (IsFreeUser.value || IsSVipUser.value) {
+                return doOpenCollectDialog(
+                  limitSource || 'pc_article_ent_limit'
+                )
+              }
+              else {
+                return doOpenDialog('max-monitor', {
+                  count: res.data?.limit_count
+                })
+              }
             }
           }
-        }
-      })
+        })
+        .finally(() => {
+          loading.value = false
+        })
     }
-    loading.value = false
   }
 
   /**