浏览代码

fix: 企业画像

yangfeng 3 年之前
父节点
当前提交
8be59e07cb

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

@@ -226,7 +226,8 @@ var vNode = {
     },
     // 是否展示升级提示 是新超级订阅用户且购买的不是全国且浏览次数已用完
     showUpdateTip: function() {
-      return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4
+      console.log(this.isVip, this.entvisit.provin !== -1,!this.surplus, this.conf._4, this.powerInfo.memberStatus <= 0)
+      return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4 && this.powerInfo.memberStatus <= 0
     }
   },
   methods: {

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -268,7 +268,7 @@
               </ul>
             </div>
           </div>
-          <div class="vip_component" v-if="getStatus || !conf._13"
+          <div class="vip_component" v-if="getStatus && !conf._13"
             style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
             <vip-component @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" :newvip="isVip"
               imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/vip_ex_1.png'>

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

@@ -224,7 +224,7 @@ var vNode = {
         },
         // 是否展示升级提示 是新超级订阅用户且购买的不是全国且浏览次数已用完
         showUpdateTip: function() {
-          return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4
+          return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4 && this.powerInfo.memberStatus <= 0
         }
     },
     methods: {

+ 4 - 10
src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -94,22 +94,16 @@ var vipComponent = {
       //     textMap.btnText = '联系客服'
       //   }
       // }
-      // console.log(this.power.isMember, this.power._4, this.power._13, this.newvip,this.entvisit)
+      console.log(this.power.isMember, this.power._4, this.power._13, this.newvip,this.entvisit)
       if (this.power.isMember > 0 ) {
+        console.log('111', this.entvisit.total, this.entvisit.usage, this.newvip)
         if (this.entvisit.total <= this.entvisit.usage && this.newvip) {
-          if (this.entvisit.provin == 0) {
-            textMap.btnText = '去开通'
-          } else if (this.entvisit.provin != -1) {
-            textMap.titleText = '超级订阅'
-            textMap.btnText = '去升级'
-          } else if(this.entvisit.provin == -1) {
-            textMap.titleText = '超级订阅'
-            textMap.btnText = '联系客服'
-          }
+          textMap.btnText = '联系客服'
         } else {
           textMap.btnText = '联系客服'
         }
       } else {
+        console.log('222', this.entvisit.total, this.entvisit.usage, this.newvip)
         if (this.entvisit.total <= this.entvisit.usage && this.newvip) {
           if (this.entvisit.provin == 0) {
             textMap.btnText = '去开通'

+ 1 - 1
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -266,7 +266,7 @@
                         </ul>
                     </div>
                 </div>
-                <div class="vip_component" v-if="getStatus || !conf._13" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
+                <div class="vip_component" v-if="getStatus && !conf._13" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%">
                     <vip-component @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" :newvip="isVip"  imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png'></vip-component>
                 </div>
                 <div class="vip_component" v-if="!showContacts" style="height:11.36rem;background:url('/common-module/collection/image/bg/vip_bg_9.png') no-repeat;background-size:100% 100%">