fix: 企业画像

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

@@ -30,7 +30,8 @@ var vNode = {
         // 是否有企业情报历史记录权限
         _12: false,
         isMember: 0, // 是否是大会员
-        arr: []
+        arr: [], // 权限数组
+        vipStatus: 0 // 是否是超级订阅
       },
       powerInfo: {},
       tabActiveName: '1',
@@ -210,24 +211,20 @@ var vNode = {
     },
     // 查看次数为零，显示遮罩
     getStatus: function () {
-      return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts)
+      return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts)
     },
     isMember () {
       return this.powerInfo.memberStatus <= 0 || !this.conf._4
     },
     isShowUpTip () {
-      return this.entvisit.provin == -1 ? false : !this.surplus
+      // 出现升级提醒 是新超级订阅买的不是全国、次数已用完 、不是大会员
+      return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0
     },
     surplus: function () {
       return this.entvisit.total > this.entvisit.usage
     },
     showContacts: function () {
       return this.conf.arr.indexOf(4) > -1 && this.powerInfo.memberStatus > 0
-    },
-    // 是否展示升级提示 是新超级订阅用户且购买的不是全国且浏览次数已用完
-    showUpdateTip: function() {
-      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: {
@@ -383,6 +380,7 @@ var vNode = {
             if (res.data) {
               // res.data.provin = 1
               // res.data.total = 1
+              // res.data.usage = 2
               _this.entvisit = res.data
             }
           }
@@ -593,6 +591,7 @@ var vNode = {
             }
             _this.conf.isMember = res.data.memberStatus
             _this.conf.arr = res.data.power
+            _this.conf.vipStatus = res.data.vipStatus
             _this.getDataFn()
           } else {
             _this.$toast(res.error_msg)

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

@@ -204,7 +204,7 @@
         <van-tab name="2" v-if="!singleTab">
           <template #title>
             <span :class="{bidinfo:!hasOnePower}">中标信息</span>
-            <span v-if="showUpdateTip" class="bid_upgrade">升级</span>
+            <span v-if="isShowUpTip" class="bid_upgrade">升级</span>
             <span v-if="isMember && (hasOnePower && surplus && isVip)" class="bid_surplus">剩余:${entvisit.total -
               entvisit.usage}</span>
           </template>
@@ -242,38 +242,40 @@
           <div class="vip_component" v-if="getStatus"
             style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%">
           </div>
-          <div class="j-container empty" style="padding-bottom: .2rem;"
-            v-if="conf._13 && !conf._4 && topProject.list.length === 0">
-            <div class="j-img img-empty empty-img"></div>
-            <p class="empty-text">暂无项目动态</p>
-          </div>
-          <div class="bg-white tab-card cell-list" v-show="conf._13 && topProject.list.length !== 0">
-            <div class="tab-card-title">项目动态</div>
-            <div class="tab-card-content">
-              <ul class="project-info-list">
-                <li class="project-info-item border-line-b clickable" v-for="(item,index) in topProject.list"
-                  @click="toProjectDetail(item)">
-                  <div class="project-name">${item.title}</div>
-                  <div class="project-info">
-                    <span class="tags">
-                      <span class="tag tag-success" v-if="item.area">${item.area}</span>
-                      <span class="tag tag-success" v-if="item.bidstatus">${item.bidstatus}</span>
-                      <span class="tag tag-success" v-if="item.bidamount">${utils.moneyUnit(item.bidamount)}</span>
-                    </span>
-                    <span class="project-time">${item.firsttime ? new Date(item.firsttime * 1000).pattern('yyyy-MM-dd')
-                      : '-'}</span>
-                  </div>
-                </li>
-                <li class="show-more" v-if="topProject.showGetNextButton" @click="getProjectNews">查看更多</li>
-              </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%" key="dt">
             <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'>
             </vip-component>
           </div>
+          <div v-else key="dt">
+            <div class="j-container empty" style="padding-bottom: .2rem;"
+              v-if="conf._13 && !conf._4 && topProject.list.length === 0">
+              <div class="j-img img-empty empty-img"></div>
+              <p class="empty-text">暂无项目动态</p>
+            </div>
+            <div class="bg-white tab-card cell-list" v-show="conf._13 && topProject.list.length !== 0">
+              <div class="tab-card-title">项目动态</div>
+              <div class="tab-card-content">
+                <ul class="project-info-list">
+                  <li class="project-info-item border-line-b clickable" v-for="(item,index) in topProject.list"
+                    @click="toProjectDetail(item)">
+                    <div class="project-name">${item.title}</div>
+                    <div class="project-info">
+                      <span class="tags">
+                        <span class="tag tag-success" v-if="item.area">${item.area}</span>
+                        <span class="tag tag-success" v-if="item.bidstatus">${item.bidstatus}</span>
+                        <span class="tag tag-success" v-if="item.bidamount">${utils.moneyUnit(item.bidamount)}</span>
+                      </span>
+                      <span class="project-time">${item.firsttime ? new Date(item.firsttime * 1000).pattern('yyyy-MM-dd')
+                        : '-'}</span>
+                    </div>
+                  </li>
+                  <li class="show-more" v-if="topProject.showGetNextButton" @click="getProjectNews">查看更多</li>
+                </ul>
+              </div>
+            </div>
+          </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%">
             <vip-component @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :newvip="isVip"

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

@@ -28,7 +28,8 @@ var vNode = {
                 // 是否显示中标企业动态
                 _13: false,
                 isMember: 0, // 是否是大会员
-                arr: []
+                arr: [], // 权限列表
+                vipStatus: 0 // 是否是超级订阅
             },
             powerInfo: {},
             tabActiveName: '',
@@ -214,7 +215,7 @@ var vNode = {
           return this.powerInfo.memberStatus <= 0 || !this.conf._4
         },
         isShowUpTip () {
-            return this.entvisit.provin == -1 ? false : !this.surplus
+          return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip
         },
         surplus: function () {
             return this.entvisit.total > this.entvisit.usage
@@ -583,6 +584,7 @@ var vNode = {
                         }
                         _this.conf.isMember = res.data.memberStatus
                         _this.conf.arr = res.data.power
+                        _this.conf.vipStatus = res.data.memberStatus
                         _this.getDataFn()
                     } else {
                         _this.$toast(res.error_msg)

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

@@ -83,27 +83,18 @@ var vipComponent = {
         },
         source: ''
       }
-      // 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 = '联系客服'
-      //   }
-      // }
-      console.log(this.power.isMember, this.power._4, this.power._13, this.newvip,this.entvisit)
+      console.log(this.power, this.power.isMember, this.power._4, this.power._13, this.newvip,this.entvisit, this.power.vipStatus)
       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) {
           textMap.btnText = '联系客服'
         } else {
-          textMap.btnText = '联系客服'
+          if (this.type === 'item_1') {
+            textMap.btnText = !this.newvip && this.power.vipStatus > 0  ? '去升级' : '去开通'
+          } 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 = '去开通'
@@ -115,7 +106,11 @@ var vipComponent = {
             textMap.btnText = '联系客服'
           }
         } else {
-          textMap.btnText = '免费体验'
+          if (this.type === 'item_1') {
+            textMap.btnText = !this.newvip && this.power.vipStatus > 0  ? '去升级' : '去开通'
+          } else {
+            textMap.btnText = '免费体验'
+          }
         }
       }
       switch (this.type) {
@@ -191,7 +186,7 @@ var vipComponent = {
           // 历史项目联系方式
         case 'item_9': {
           textMap.titleText = '开通大会员'
-          // textMap.btnText = this.power.isMember > 0 && this.power.arr.indexOf(4) == -1 ? '联系客服' : '免费体验'
+          textMap.btnText = this.power.isMember > 0 && this.power.arr.indexOf(4) == -1 ? '联系客服' : '免费体验'
           textMap.headText.top = '获取企业历史项目联系人信息，'
           textMap.headText.bot = '直接与甲方或渠道商项目负责人对接！'
           textMap.source = 'ent_portrait_contacts'

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

@@ -206,7 +206,7 @@
             <van-tab name="2" >
                 <template #title>
                     <span :class="{bidinfo:!hasOnePower}">中标信息</span>
-                    <span v-if="showUpdateTip" class="bid_upgrade">升级</span>
+                    <span v-if="isShowUpTip" class="bid_upgrade">升级</span>
                     <span v-if="isMember && (hasOnePower && surplus && isVip)" class="bid_surplus">剩余:${entvisit.total - entvisit.usage}</span>
                 </template>
                 <div class="bg-white tab-card" v-if="conf._4 && !getStatus">
@@ -236,6 +236,11 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%"></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%" key="dt">
+                  <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 v-else key="dt">
                 <div class="j-container empty" style="padding-bottom: .2rem;"  v-if="conf._13 && !conf._4 && topProject.list.length === 0">
                     <div class="j-img img-empty empty-img"></div>
                     <p class="empty-text">暂无项目动态</p>
@@ -266,9 +271,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%">
-                    <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>
                 <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%">
                     <vip-component @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png'></vip-component>
                 </div>