Merge branch 'feature/v4.8.40_z' of qmx/jy into release/v4.8.40

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

@@ -410,7 +410,7 @@ var vNode = {
     },
     // 获取画像信息
     getEntPortrait: function (callback) {
-      if(!this.isLogin) {
+      if(!this.isLogin || this.isFree) {
         return
       }
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))

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

@@ -390,10 +390,10 @@
           </div>
         </div>
         <!-- 免费用户采购单位全景分析提示 -->
-        <div v-if="canFreeExp && isLogin" style="margin-top: .24rem; " class="free-give">
-          <div class="go-text"> 免费赠送1次【企业中标分析】权益体验机会！</div>
-          <div class="go-btn" @click="goGiveAnalysis">去解锁</div>
-        </div>
+<!--        <div v-if="canFreeExp && isLogin" style="margin-top: .24rem; " class="free-give">-->
+<!--          <div class="go-text"> 免费赠送1次【企业中标分析】权益体验机会！</div>-->
+<!--          <div class="go-btn" @click="goGiveAnalysis">去解锁</div>-->
+<!--        </div>-->
         <!-- 中标信息统计结果-->
         <div class="bg-white tab-card" v-if="!isFreeOrNotLogin">
           <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">中标信息统计结果</div>

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

@@ -280,10 +280,10 @@
           </van-sticky>
         </div>
         <!-- 免费用户采购单位全景分析提示 -->
-        <div v-if="getfreeBuyerPort && isLogin" class="free-give">
-          <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会！</div>
-          <div class="go-btn" @click="goGiveAnalysis">去解锁</div>
-        </div>
+<!--        <div v-if="getfreeBuyerPort && isLogin" class="free-give">-->
+<!--          <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会！</div>-->
+<!--          <div class="go-btn" @click="goGiveAnalysis">去解锁</div>-->
+<!--        </div>-->
         <!-- 采购单位通讯录 -->
         <div v-if="getStatus">
           <div class="vip_component"

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

@@ -197,7 +197,7 @@ var buyerExample = {
       var info = this.userinfo
       var usage = this.useage
       // 【登录查看】：未登录,点击跳转到登录
-      // 【立即解锁】：未体验过采购单位画像的免费用户，点击进行“欢迎体验采购单位全景分析”留资
+      // 【免费体验】：未体验过采购单位画像的免费用户，点击进行“欢迎体验采购单位全景分析”留资
       // 【去开通】：已体验过1次采购单位画像的免费用户，点击进入超级订阅购买页
       // 【前往升级】：超级订阅老版用户+购买了非全国采购单位画像余额为0的超级订阅新版用户，点击进入超级订阅升级页
       // 【联系客服】：购买了全国采购单位画像余额为0的超级订阅新版用户+无采购单位画像权限的大会员客户；点击调起智齿在线客服
@@ -205,7 +205,8 @@ var buyerExample = {
         btnText = '登录查看'
       } else if (info.isFree) {
         if (info.freeBuyerPort === 0) {
-          btnText = '立即解锁'
+          // btnText = '免费体验'
+          btnText = '免费体验'
         } else {
           btnText = '去开通'
         }
@@ -250,7 +251,7 @@ var buyerExample = {
       `
       var isWeixin = utils.isWeiXinBrowser
       if(!isWeixin) {
-        if (this.getTextMap.btnText == '立即解锁') {
+        if (this.getTextMap.btnText == '免费体验') {
           // 留资
           location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '联系客服') {
@@ -299,7 +300,7 @@ var buyerExample = {
           }
         }
       } else {
-        if (this.getTextMap.btnText == '立即解锁') {
+        if (this.getTextMap.btnText == '免费体验') {
           // 留资
           location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '联系客服') {
@@ -351,7 +352,7 @@ var buyerExample = {
       console.log(_this.getTextMap.btnText)
       if(_this.getTextMap.btnText == '登录查看'){
         window.location.href = "/jyapp/free/login?to=back";
-      } else if (_this.getTextMap.btnText == '立即解锁') {
+      } else if (_this.getTextMap.btnText == '免费体验') {
         $.ajax({
           type: 'POST',
           url: '/publicapply/drainage/buyerunit',

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

@@ -415,6 +415,9 @@ var vNode = {
     },
     // 获取画像信息
     getEntPortrait: function (callback) {
+      if (this.isFree) {
+        return
+      }
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       // if (!storageSet) return
       var _this = this

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

@@ -134,7 +134,8 @@ var vipComponent = {
 
         // （2）【立即解锁】：未体验过企业画像的免费用户，中标分析各模块，点击进行“欢迎体验企业中标分析”留资；
         if (this.canFreeExp) {
-          textMap.btnText = '立即解锁'
+          // textMap.btnText = '立即解锁'
+          textMap.btnText = '免费体验'
         } else {
           if (this.power.vipStatus <= 0) {
             textMap.btnText = '去开通'

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -412,10 +412,10 @@
             </van-sticky>
           </div>
           <!-- 免费用户采购单位全景分析提示 -->
-          <div v-if="getfreeBuyerPort" class="free-give">
-            <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会！</div>
-            <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>
-          </div>
+<!--          <div v-if="getfreeBuyerPort" class="free-give">-->
+<!--            <div class="go-text"> 免费赠送1次【采购单位全景分析】权益体验机会！</div>-->
+<!--            <div class="go-btn"  @click="goGiveAnalysis">去解锁</div>-->
+<!--          </div>-->
           <!-- 采购单位通讯录 -->
           <div>
             <div v-if="getStatus" key="txl">
@@ -715,6 +715,22 @@
           </div>
           <!-- 遮罩部分 -->
           <div v-if="getStatus">
+<!--            招标动态-->
+          <div class="vip_component" style="height:8.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
+            <p class="example-title">招标动态</p>
+            <div class="example-export">
+                <span>
+                  <i class="j-icon base-icon icon-download-999"></i>
+                  <em style="color:#999;">数据导出</em>
+                </span>
+            </div>
+             <buyer-example style="margin-top:1rem;"  :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_14" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/cg-zbdt.png?v={{Msg "seo" "version"}}'></buyer-example>
+          </div>
+<!--            统计信息-->
+         <div class="vip_component" style="height:7.56rem;background:#fff url('/common-module/collection/image/buyer/cg-tjxx-bg.png?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%">
+            <p class="example-title">统计信息</p>
+            <buyer-example  :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_13" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/buyer/cg-tjxx.png?v={{Msg "seo" "version"}}'></buyer-example>
+         </div>
             <!-- 历史项目联系人 -->
             <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/01-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
               <p class="example-title">历史项目联系方式</p>

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

@@ -381,10 +381,10 @@
                   </div>
                 </div>
                 <!--免费用户体验-->
-                <div v-if="canFreeExp" class="freeExper">
-                    <p class="freeRemark">免费赠送1次【企业中标分析】权益体验机会！</p>
-                    <span @click="goExpAnalysis">去解锁</span>
-                </div>
+<!--                <div v-if="canFreeExp" class="freeExper">-->
+<!--                    <p class="freeRemark">免费赠送1次【企业中标分析】权益体验机会！</p>-->
+<!--                    <span @click="goExpAnalysis">去解锁</span>-->
+<!--                </div>-->
                 <div class="bg-white tab-card" data-cl-event="c_wx_open_buttionclick" v-if="!isFreeOrNotLogin">
                     <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">中标信息统计结果</div>
                     <div class="card-row zb-info">