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

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

@@ -261,7 +261,11 @@ var vNode = {
     // 是否隐藏动态 显示遮罩
     hideDt: function () {
       // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
-      return this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage || this.conf.arr.indexOf(13) === -1
+      // 超级订阅次数用完了
+      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
+      return vipNoBalance || bigmemberNoPower
     },
     isMemberAndSvip: function () {
       return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0

src/web/staticres/common-module/collection/js/buyer-example.js

@@ -150,21 +150,21 @@ var buyerExample = {
         case 'item_9': {
           textMap.headText.top = '深入分析采购单位合作企业规模情况，辅助'
           textMap.headText.bot = '投标决策'
-          textMap.source = 'buyer_portrait_cooperative_ent_capital'
+          textMap.source = 'buyer_portrait_cooperative_ent_capital_freeuser'
           break
         }
          // 合作企业年龄分布
         case 'item_10': {
           textMap.headText.top = '洞察采购单位合作企业成立时间，预判企业'
           textMap.headText.bot = '实力'
-          textMap.source = 'buyer_portrait_cooperative_ent_age'
+          textMap.source = 'buyer_portrait_cooperative_ent_age_freeuser'
           break
         }
         // 合作企业注册地分布
         case 'item_11': {
           textMap.headText.top = '获取采购单位合作企业注册地详情，了解业务'
           textMap.headText.bot = '分布情况'
-          textMap.source = 'buyer_portrait_cooperative_ent_register_area'
+          textMap.source = 'buyer_portrait_cooperative_ent_register_area_freeuser'
           break
         }
         // 重点合作代理机构
@@ -178,14 +178,14 @@ var buyerExample = {
         case 'item_13': {
           textMap.headText.top = '精准分析采购单位历史运作项目，'
           textMap.headText.bot = '采购动态一目了然'
-          textMap.source = 'buyer_portrait_bidInfoDesc'
+          textMap.source = 'buyer_portrait_bidInfoDesc_freeuser'
           break
         }
         // 招标动态
         case 'item_14': {
           textMap.headText.top = '查看采购单位最新招标动态，及时跟踪采'
           textMap.headText.bot = '购需求'
-          textMap.source = 'buyer_portrait_bidInfoList'
+          textMap.source = 'buyer_portrait_bidInfoList_freeuser'
           break
         }
       }

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

@@ -261,7 +261,11 @@ var vNode = {
     // 是否隐藏动态 显示遮罩
     hideDt: function () {
       // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
-      return this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage || this.conf.arr.indexOf(13) === -1
+      // 超级订阅次数用完了
+      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
+      return vipNoBalance || bigmemberNoPower
     },
     isMemberAndSvip: function () {
       return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -100,6 +100,10 @@ var tipMap = {
   buyer_portrait_topAgencyData_freeuser: freeBuyerText,
   buyer_portrait_contacts_freeuser: freeBuyerText,
   buyer_portrait_firstShow_freeuser: freeBuyerText,
+  buyer_portrait_cooperative_ent_capital_freeuser: freeBuyerText,
+  buyer_portrait_cooperative_ent_age_freeuser: freeBuyerText,
+  buyer_portrait_bidInfoDesc_freeuser: freeBuyerText,
+  buyer_portrait_bidInfoList_freeuser: freeBuyerText,
 
   activity_free_plan: '请完善信息，免费获取200剑鱼币',
   super_membership_day: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',

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

@@ -59,7 +59,7 @@
                 <p class="empty-text">暂无工商变动</p>
             </div>
         </div>
-        <div class="vip_component bigVip_com" v-show="!getStatus" style="height:100%;background:url('/common-module/collection/image/bg/vip_bg_8.png') no-repeat;background-size:100% 100%">
+        <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">