Merge branch 'dev/v4.9.93_tsz' of qmx/jy into feature/v4.9.93

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

@@ -483,7 +483,6 @@ var vNode = {
           success: function (res) {
             if (res.data === 'success') {
               _this.$toast('修改分组成功')
-              _this.setGroupState = ''
               // 更新分组内容
               _this.getEntFollowState()
             } else {
@@ -492,12 +491,14 @@ var vNode = {
             }
           }
         })
+        _this.setGroupState = ''
       } else {
         this.changeFollowStateRequest(params)
       }
     },
     cancelGrouping () {
       this.showGroupingDialog = false
+      this.setGroupState = ''
     },
     // 监听画像页面滚动
     onEntScroll: utils.debounce(function (e) {
@@ -1205,6 +1206,7 @@ var vNode = {
             sessionStorage.removeItem('$data-ent_follow')
             loading.clear()
             if (res.data === 'success' || res.data.status) {
+              const active = !_this.powerInfo.isFree ? 4 : 3
               _this.entInfo.follow = !_this.entInfo.follow
               _this.getEntFollowState()
               if(utils.$envs.inApp && JyObj.checkNoticePermission()!=1 && res.data.status){
@@ -1222,7 +1224,7 @@ var vNode = {
                   // cancelButtonColor: '#5F5E64'
                 }).then(() =>{
                   //  展开监控菜单 active:4
-                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
+                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
                 return
               }
@@ -1241,7 +1243,7 @@ var vNode = {
                   // cancelButtonColor: '#5F5E64'
                 }).then(() =>{
                   //  展开监控菜单 active:3
-                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
+                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
         
               } else if(res.data.msg_open && res.data.status){

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -461,7 +461,6 @@ var vNode = {
           success: function (res) {
             if (res.data === 'success') {
               _this.$toast('修改分组成功')
-              _this.setGroupState = ''
               // 更新分组内容
               _this.getEntFollowState()
             } else {
@@ -470,12 +469,14 @@ var vNode = {
             }
           }
         })
+        _this.setGroupState = ''
       } else {
         this.changeFollowStateRequest(params)
       }
     },
     cancelGrouping () {
       this.showGroupingDialog = false
+      _this.setGroupState = ''
     },
     // 监听画像页面滚动
     onEntScroll: utils.debounce(function(e){
@@ -1155,6 +1156,7 @@ var vNode = {
             sessionStorage.removeItem('$data-ent_follow')
             loading.clear()
             if (res.data === 'success' || res.data.status) {
+              const active = !_this.powerInfo.isFree ? 4 : 3
               _this.entInfo.follow = !_this.entInfo.follow
               _this.getEntFollowState()
               if(utils.$envs.inApp && JyObj.checkNoticePermission()!=1 && res.data.status){
@@ -1172,7 +1174,7 @@ var vNode = {
                   // cancelButtonColor: '#5F5E64'
                 }).then(() =>{
                   //  展开监控菜单 active:4
-                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
+                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
                 return
               }
@@ -1191,7 +1193,7 @@ var vNode = {
                   // cancelButtonColor: '#5F5E64'
                 }).then(() =>{
                   //  展开监控菜单 active:3
-                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=4'
+                  window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
         
               } else if(res.data.msg_open && res.data.status){