Merge branch 'master' into feature/v4.10.5

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

@@ -343,7 +343,7 @@ var vNode = {
       var info = this.powerInfo
       var isNoMember = info.memberStatus <= 0
       var isOldVip = info.vipStatus > 0 && !info.viper
-      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus
+      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus && !this.entvisit.visited
       var isNotAll = this.entvisit.provin !== -1
       return (isOldVip || (isNewVip && isNotAll)) && isNoMember
     },
@@ -441,7 +441,7 @@ var vNode = {
             const filterSelect = _this.groupingList.filter(item => !!item.isSelect)
             const selectList = filterSelect.map(item => item.s_name) || ['默认分组']
             _this.$refs.portrayalGrouping.setState(selectList)
-            
+
           } else {
             if(!res?.data?.status) {
                 // 监控达到上限
@@ -930,7 +930,7 @@ var vNode = {
     },
     changeGroupState: function (type) {
       console.log(type);
-      this.getEntGroupListData() 
+      this.getEntGroupListData()
       this.$nextTick(() => {
         this.setGroupState = type
         this.showGroupingDialog = true
@@ -996,7 +996,7 @@ var vNode = {
         } else {
           _this.changeFollowStateRequest()
         }
-        
+
       } else {
         this.getEntFollowState((res) => {
           const { surplus, used } = res.info
@@ -1245,13 +1245,13 @@ var vNode = {
                   //  展开监控菜单 active:3
                   window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
-        
+
               } else if(res.data.msg_open && res.data.status){
                 _this.$toast({
                   duration: 2000,
                   message: '监控成功，您可前往“工作台-商机-企业情报监控”查看'
                 })
-        
+
               }
             } else {
               return _this.showToast(res.error_msg || '监控失败')

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

@@ -341,7 +341,7 @@ var vNode = {
       var info = this.powerInfo
       var isNoMember = info.memberStatus <= 0
       var isOldVip = info.vipStatus > 0 && !info.viper
-      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus
+      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus && !this.entvisit.visited
       var isNotAll = this.entvisit.provin !== -1
       return (isOldVip || (isNewVip && isNotAll)) && isNoMember
     },
@@ -889,7 +889,7 @@ var vNode = {
     },
     changeGroupState: function (type) {
       console.log(type);
-      this.getEntGroupListData() 
+      this.getEntGroupListData()
       this.$nextTick(() => {
         this.setGroupState = type
         this.showGroupingDialog = true
@@ -952,7 +952,7 @@ var vNode = {
           _this.showGroupingDialog = false
           _this.changeFollowStateRequest()
         }
-        
+
       } else {
         this.getEntFollowState((res) => {
           const { surplus, used } = res.info
@@ -1198,13 +1198,13 @@ var vNode = {
                   //  展开监控菜单 active:3
                   window.location.href = location.origin + '/jy_mobile/push/pushsetting?active=' + active
                 })
-        
+
               } else if(res.data.msg_open && res.data.status){
                 _this.$toast({
                   duration: 2000,
                   message: '监控成功，您可前往“工作台-商机-企业情报监控”查看'
                 })
-        
+
               }
             } else {
               return _this.showToast(res.error_msg || '监控失败')
@@ -1846,11 +1846,11 @@ var vNode = {
       var container = document.querySelector('.sesame-main');
       if(!container) return
       var items = container.getElementsByClassName('sesame-item');
-  
+
       // 获取所有子元素的top值,如果所有子元素的top值相同,则说明只有一行
       var firstItemTop = items[0].offsetTop;
       var isOneRow = true;
-  
+
       for (var i = 1; i < items.length; i++) {
         if (items[i].offsetTop !== firstItemTop) {
           isOneRow = false;