Переглянути джерело

fix: 企业画像大会员自定义权限修复

cuiyalong 1 рік тому
батько
коміт
71abb9e222

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

@@ -218,11 +218,7 @@ var vNode = {
     var _this = this
     // 动态调整sticky距离顶部的高度
     this.getStickyTop()
-    if (this.scrollTop) {
-      setTimeout(function () {
-        $('#ent-portrait').scrollTop(_this.scrollTop)
-      }, 0)
-    }
+    this.reStoreScroll()
     this.getShareParams()
     window.addEventListener('resize', function () {
       _this.getStickyTop()
@@ -840,8 +836,8 @@ var vNode = {
               _this.freeWinnerOpen = true
             }
           }
-          // 免费用户看过当前企业画像数据
-          if (res.data.isFree) {
+          // 免费用户/商机管理无权限体验 看过当前企业画像数据
+          if (res.data.isFree || _this.powerInfo.entniche) {
             _this.getEntPortrait(function (res) {
               if (res && res.data && res.data.onTrial) {
                 _this.canFreeTrial = true
@@ -1415,7 +1411,7 @@ var vNode = {
     },
     savePageState: function () {
       this.scrollTop = $('#ent-portrait').scrollTop()
-      var scrollTopOffset = 0 // 滚动误差
+      var scrollTopOffset = 10 // 滚动误差
       var data = {
         conf: this.conf,
         tabActiveName: this.tabActiveName,
@@ -1424,6 +1420,8 @@ var vNode = {
         topProject: this.topProject,
         entPortraitInfo: this.entPortraitInfo,
         powerInfo: this.powerInfo,
+        svipBuyset: this.svipBuyset,
+        bidcollPowerInfo: this.bidcollPowerInfo,
         scrollTop: this.scrollTop + scrollTopOffset,
         gotTab2: this.gotTab2
       }
@@ -1445,6 +1443,8 @@ var vNode = {
         Object.assign(this.topProject, $data.topProject || {})
         Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
         Object.assign(this.powerInfo, $data.powerInfo || {})
+        Object.assign(this.svipBuyset, $data.svipBuyset || {})
+        Object.assign(this.bidcollPowerInfo, $data.bidcollPowerInfo || {})
         Object.assign(this.entvisit, $data.entvisit || {})
         this.scrollTop = $data.scrollTop
         this.gotTab2 = $data.gotTab2
@@ -1452,6 +1452,14 @@ var vNode = {
       }
       return !!$data
     },
+    reStoreScroll: function () {
+      var _this = this
+      if (this.scrollTop) {
+        setTimeout(function () {
+          $('#ent-portrait').scrollTop(_this.scrollTop)
+        }, 200)
+      }
+    },
     // 高级分析设置
     goHighSet () {
       if(!this.isLogin) {

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

@@ -289,14 +289,14 @@
                   <i class="j-icon base-icon icon-download"></i>
                   <em class="action-button-text">数据导出</em>
               </div>
-              <div class="action-button filters-button" @click="goHighSet" v-if="!getStatus">
+              <div class="action-button filters-button" @click="goHighSet" v-if="!hideDt">
                 <i class="j-icon base-icon icon-3hengxian"></i>
                 <em class="action-button-text">筛选条件</em>
               </div>
             </div>
           </div>
           <div class="module-notice-tip">注:1个项目如同时发布了中标、成交、合同等结果类公告,则有多条数据</div>
-          <div class="tab-card-content vip_component" v-if="getStatus && hideDt"
+          <div class="tab-card-content vip_component" v-if="hideDt"
             style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%"
             key="dt">
             <vip-component @tabactive="tabActive" :power="conf" type="item_1" :can-free-exp="canFreeExp"

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

@@ -215,11 +215,7 @@ var vNode = {
     var _this = this
     // 动态调整sticky距离顶部的高度
     this.getStickyTop()
-    if (this.scrollTop) {
-      setTimeout(function () {
-        $('#ent-portrait').scrollTop(_this.scrollTop)
-      }, 0)
-    }
+    this.reStoreScroll()
     this.getShareParams()
     window.addEventListener('resize', function () {
       _this.getStickyTop()
@@ -783,7 +779,6 @@ var vNode = {
               _this.canReadConf13()
               if (power.indexOf(12) != -1) {
                 // 获取企业情报历史记录(工商变动)-12
-                _this.getVipBuyInfo()
                 _this.conf._12 = true
               }
               // // follow的权限:4.12.13只要有一个就可以
@@ -810,8 +805,8 @@ var vNode = {
                   _this.freeWinnerOpen = true
                 }
 	            }
-              // 免费用户看过当前企业画像数据
-              if (res.data.isFree) {
+              // 免费用户/商机管理无权限体验 看过当前企业画像数据
+              if (res.data.isFree || _this.powerInfo.entniche) {
                 _this.getEntPortrait(function (res) {
                   if (res && res.data && res.data.onTrial) {
                     _this.canFreeTrial = true
@@ -832,6 +827,7 @@ var vNode = {
             }
 
             if (res.data.vipStatus > 0) {
+              _this.getVipBuyInfo()
               if (!res.data.viper) {
                 _this.bidcollPowerInfo.text = '升级'
                 _this.bidcollPowerInfo.btntext = '去升级'
@@ -1366,6 +1362,7 @@ var vNode = {
     },
     savePageState: function () {
       this.scrollTop = $('#ent-portrait').scrollTop()
+      var scrollTopOffset = 10 // 滚动误差
       var data = {
         conf: this.conf,
         tabActiveName: this.tabActiveName,
@@ -1374,7 +1371,9 @@ var vNode = {
         topProject: this.topProject,
         entPortraitInfo: this.entPortraitInfo,
         powerInfo: this.powerInfo,
-        scrollTop: this.scrollTop,
+        svipBuyset: this.svipBuyset,
+        bidcollPowerInfo: this.bidcollPowerInfo,
+        scrollTop: this.scrollTop + scrollTopOffset,
         gotTab2: this.gotTab2
       }
       sessionStorage.setItem(this.sessKey, JSON.stringify(data))
@@ -1395,6 +1394,8 @@ var vNode = {
         Object.assign(this.topProject, $data.topProject || {})
         Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
         Object.assign(this.powerInfo, $data.powerInfo || {})
+        Object.assign(this.svipBuyset, $data.svipBuyset || {})
+        Object.assign(this.bidcollPowerInfo, $data.bidcollPowerInfo || {})
         Object.assign(this.entvisit, $data.entvisit || {})
         this.scrollTop = $data.scrollTop
         this.gotTab2 = $data.gotTab2
@@ -1402,6 +1403,14 @@ var vNode = {
       }
       return !!$data
     },
+    reStoreScroll: function () {
+      var _this = this
+      if (this.scrollTop) {
+        setTimeout(function () {
+          $('#ent-portrait').scrollTop(_this.scrollTop)
+        }, 200)
+      }
+    },
     // 高级分析设置
     goHighSet () {
       sessionStorage.setItem('is-click-set', 1)

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

@@ -147,6 +147,14 @@ var vipComponent = {
       switch (this.type) {
           // 项目动态
         case 'item_1': {
+          var buttonText = ''
+          // 非超级订阅,仅开通了大会员自定义(无13项目动态权限)
+          if (this.power.vipStatus <= 0 && this.power.isMember > 0 && !this.power._13) {
+            buttonText = '联系客服'
+          }
+          if (buttonText) {
+            textMap.btnText = buttonText
+          }
           textMap.headText.top = '通过实时监控项目的招标、中标、合同等'
           textMap.headText.bot = '信息,全面挖掘更多潜在商机!'
           textMap.source = 'ent_portrait_winnerNewMsg_freeuser'

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

@@ -289,14 +289,14 @@
                                 <i class="j-icon base-icon icon-download"></i>
                                 <em class="action-button-text">数据导出</em>
                             </div>
-                            <div class="action-button filters-button" @click="goHighSet" v-if="!getStatus">
+                            <div class="action-button filters-button" @click="goHighSet" v-if="!hideDt">
                                 <i class="j-icon base-icon icon-3hengxian"></i>
                                 <em class="action-button-text">筛选条件</em>
                             </div>
                         </div>
                     </div>
                     <div class="module-notice-tip">注:1个项目如同时发布了中标、成交、合同等结果类公告,则有多条数据</div>
-                    <div class="tab-card-content vip_component" v-if="getStatus && hideDt"
+                    <div class="tab-card-content vip_component" v-if="hideDt"
                         style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%"
                         key="dt">
                         <vip-component @tabactive="tabActive" :power="conf" type="item_1" :can-free-exp="canFreeExp" data-cl-event="c_wx_open_buttionclick"