Merge branch 'dev/v4.9.8_tsz' of qmx/jy into release/v4.9.8

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -213,11 +213,14 @@ var vNode = {
     //         return v.topData.length
     //     })
     // },
+    getActiveRoot: function () {
+      return this.power.includes(24) || this.power.includes(25)
+    },
     getStatus: function () {
       var info = this.userInfo
       var isFreeAuth = info.isFree && info.freeBuyerPort > 0
       var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
-      const hasPower = this.power.includes(5) || this.power.includes(24) || this.power.includes(25) || this.power.includes(4)
+      const hasPower = this.power.includes(5)
       var isMember = this.power && hasPower
       // 超级订阅用户是否访问过该画像
       var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0 && this.usageInfo.visited
@@ -571,7 +574,7 @@ var vNode = {
       }
       // 无权限的弹出弹框提醒
       let _this = this
-      if (this.getStatus) {
+      if (this.getStatus && !getActiveRoot) {
         var u = this.usageInfo
         if (u.usage >= u.total && u.balance >= 0) {
           this.$dialog.confirm({

src/web/staticres/big-member/js/unit_portrayal.js

@@ -213,11 +213,14 @@ var vNode = {
                 return v.topData.length
             })
         },
+        getActiveRoot: function () {
+          return this.power.includes(24) || this.power.includes(25)
+        },
         getStatus: function () {
           var info = this.userInfo
           var isFreeAuth = info.isFree && info.freeBuyerPort > 0
           var isVipAuth = info.vipStatus > 0 && info.viper && this.usageInfo.surplus > 0
-          const hasPower = this.power.includes(5) || this.power.includes(24) || this.power.includes(25) || this.power.includes(4)
+          const hasPower = this.power.includes(5)
           var isMember = this.power && hasPower
           // 超级订阅用户是否访问过该画像
           var vipTrial = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0 && this.usageInfo.visited
@@ -597,7 +600,7 @@ var vNode = {
         goProjectPage: function () {
           // 无权限的弹出弹框提醒
           let _this = this
-          if (this.getStatus) {
+          if (this.getStatus && !getActiveRoot) {
             var u = this.usageInfo
             if (u.usage >= u.total && u.balance >= 0) {
               this.$dialog.confirm({