Merge branch 'dev/4.8.59_cyl' of qmx/jy into release/v4.8.59

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

@@ -261,13 +261,15 @@ var vNode = {
     // 是否隐藏动态 显示遮罩
     hideDt: function () {
       // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
-      // 超级订阅次数用完了
+      // 纯超级订阅次数用完了
       var vipNoBalance = this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage
-      // 大会员没权限
-      var bigmemberNoPower = this.powerInfo.memberStatus > 0 && this.conf.arr.indexOf(13) === -1
+      // 纯大会员没权限
+      var bigmemberNoPower = !this.isVip && this.powerInfo.memberStatus > 0 && this.conf.arr.indexOf(13) === -1
       // 免费用户无试用
       var freeNoTrail = this.powerInfo.isFree && !this.canFreeTrial
-      return vipNoBalance || bigmemberNoPower || freeNoTrail
+      // 纯商机管理用户
+      var entniche = !this.isVip && this.powerInfo.memberStatus <= 0 && this.powerInfo.entniche
+      return vipNoBalance || bigmemberNoPower || freeNoTrail || entniche
     },
     isMemberAndSvip: function () {
       return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0

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

@@ -144,6 +144,8 @@ var vNode = {
       hotChart: null,
       pieChart: null,
       userInfo: {
+        memberStatus: 0,
+        freeBuyerPort: 0,
         isFree: false,
         vipStatus: 0,
         viper: false,

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

@@ -142,6 +142,8 @@ var vNode = {
       		  isFreeExper: false, // 免费用户体验标识
             pieChart: null,
             userInfo: {
+              memberStatus: 0,
+              freeBuyerPort: 0,
               isFree: false,
               vipStatus: false,
               viper: false,

src/web/staticres/common-module/big-member/js/client_portrayal.js

@@ -143,6 +143,8 @@ var vNode = {
           hotChart: null,
           pieChart: null,
           userInfo: {
+            memberStatus: 0,
+            freeBuyerPort: 0,
             isFree: false,
             vipStatus: 0,
             viper: false,

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

@@ -261,13 +261,15 @@ var vNode = {
     // 是否隐藏动态 显示遮罩
     hideDt: function () {
       // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
-      // 超级订阅次数用完了
+      // 纯超级订阅次数用完了
       var vipNoBalance = this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage
-      // 大会员没权限
-      var bigmemberNoPower = this.powerInfo.memberStatus > 0 && this.conf.arr.indexOf(13) === -1
+      // 纯大会员没权限
+      var bigmemberNoPower = !this.isVip && this.powerInfo.memberStatus > 0 && this.conf.arr.indexOf(13) === -1
       // 免费用户无试用
       var freeNoTrail = this.powerInfo.isFree && !this.canFreeTrial
-      return vipNoBalance || bigmemberNoPower || freeNoTrail
+      // 纯商机管理用户
+      var entniche = !this.isVip && this.powerInfo.memberStatus <= 0 && this.powerInfo.entniche
+      return vipNoBalance || bigmemberNoPower || freeNoTrail || entniche
     },
     isMemberAndSvip: function () {
       return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0

src/web/templates/frontRouter/wx/collection/sess/ent_portrait_change.html

@@ -53,15 +53,15 @@
 <div class="j-container">
     {{include "/big-member/header.html"}}
     <div id="ent-portrait-change" class="j-main" v-cloak>
+        <div class="vip_component bigVip_com" v-show="!hasPower" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+            <vip-component data-cl-event="c_wx_free_buttonclick" type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png' :isLogin="true"></vip-component>
+        </div>
         <div class="j-container" v-if="noData" key="changeList">
             <div class="empty-group">
                 <div class="j-img img-empty empty-img"></div>
                 <p class="empty-text">暂无工商变动</p>
             </div>
         </div>
-        <div class="vip_component bigVip_com" v-show="!hasPower" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
-            <vip-component data-cl-event="c_wx_free_buttonclick" type="item_8" :power="conf" :vipststus="vipststus" :entvisit="entvisit" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_8.png' :isLogin="true"></vip-component>
-        </div>
         <ul class="ent-change-list" v-else key="changeList">
             <li class="ent-change-item" v-for="(item,index) in changeList" :key="item.changeTime">
                 <div class="header-time">${new Date(item.changeTime).pattern('yyyy.MM.dd')}</div>