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

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

@@ -274,6 +274,9 @@ var vNode = {
         return item
       })
       return !isShow
+    },
+    isFreeOrNotLogin () {
+      return !this.isLogin || this.isFree
     }
   },
   methods: {

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

@@ -148,6 +148,9 @@ var vNode = {
     }
   },
   computed: {
+    isFreeOrNotLogin () {
+      return !this.isLogin || this.userInfo.isFree
+    },
     allNot: function () {
       var show_1 = this.isShow.showDynamic;
       var show_2 = this.isShow.showYearData;

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

@@ -395,7 +395,7 @@
           <div class="go-btn" @click="goGiveAnalysis">去解锁</div>
         </div>
         <!-- 中标信息统计结果-->
-        <div class="bg-white tab-card" v-if="isLogin">
+        <div class="bg-white tab-card" v-if="!isFreeOrNotLogin">
           <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">中标信息统计结果</div>
           <div class="card-row zb-info">
             <div class="card-column">
@@ -429,7 +429,7 @@
           </div>
         </div>
         <!-- 中标信息统计结果--未登录-->
-        <div class="bg-white tab-card charts"  style="margin-bottom: 10px;" v-if="!isLogin">
+        <div class="bg-white tab-card charts"  style="margin-bottom: 10px;" v-if="isFreeOrNotLogin">
             <div class="tab-card-title">中标信息统计结果</div>
             <div class="vip_component" v-if="getStatus && hideDt"
                  style="height:5.8rem;background:url('/common-module/collection/image/bg/qy-zbtj-bg.png?v={{Msg "seo" "version"}}') 40% 0 no-repeat;background-size:110% 100%;"

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

@@ -306,7 +306,7 @@
             <van-icon name="arrow"></van-icon>
           </div>
         </div>
-        <div class="buyer-statistic" v-if="userInfo.isLogin">
+        <div class="buyer-statistic" v-if="!isFreeOrNotLogin">
           <div class="statistic-title">统计信息</div>
           <div class="buyer-info">
             <div class="bi-item">
@@ -337,7 +337,7 @@
           <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
         </div>
         <!-- 招标动态 -->
-        <div class="dynamic" v-if="isShow.showDynamic && userInfo.isLogin">
+        <div class="dynamic" v-if="isShow.showDynamic && !isFreeOrNotLogin">
           <!--                <div class="d_title">招标动态</div>-->
           <div class="selected-export-box">
             <div class="selected-export">
@@ -426,7 +426,7 @@
           <!--                </div>-->
         </div>
         <!-- 数据部分 -->
-        <div>
+        <div v-if="!isFreeOrNotLogin">
           <!-- 年度项目统计 -->
           <div class="years" v-if="isShow.showYearData">
             <div class="chart_title">年度项目统计</div>

src/web/staticres/big-member/js/unit_portrayal.js

@@ -148,6 +148,9 @@ var vNode = {
         }
     },
     computed: {
+      isFreeOrNotLogin () {
+        return !this.userInfo.isLogin || this.userInfo.isFree
+      },
         allNot: function() {
             var show_1 = this.isShow.showDynamic;
             var show_2 = this.isShow.showYearData;

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

@@ -139,7 +139,11 @@ var vNode = {
       isSC:0, //0未收藏 1收藏
       idx:[],
       list:[],
-      entParams: {}
+      entParams: {},
+      // 用户是否登录
+      isLogin: true,
+      // 是否是免费用户
+      isFree: false
     }
   },
   created: function () {
@@ -276,6 +280,9 @@ var vNode = {
         return item
       })
       return !isShow
+    },
+    isFreeOrNotLogin () {
+      return this.isFree
     }
   },
   methods: {
@@ -655,7 +662,7 @@ var vNode = {
     getEntBaseInfo: function () {
       var _this = this
       let urls = ''
-      if (_this.powerInfo.memberStatus <= 0 || _this.svip) {
+      if (_this.powerInfo.memberStatus <= 0 || _this.svip || _this.isFree) {
         urls = '/bigmember/portrait/subVipPortrait/entDetail'
       } else {
         urls = '/bigmember/portrait/ent/detail'
@@ -791,6 +798,7 @@ var vNode = {
               }
 	            //免费用户体验权限
 	            if(res.data.isFree){
+                _this.isFree = true
                 if (res.data.freeEntPort==0) {
                   _this.canFreeExp=true
                 } else {

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

@@ -226,7 +226,7 @@ var vipComponent = {
         // 统计信息-概况
         case 'item_10': {
           textMap.titleText = ''
-          textMap.btnText = '登录查看'
+          textMap.btnText = this.power.isMember > 0 && this.power.arr.indexOf(4) == -1 ? '联系客服' : '免费体验'
           textMap.headText.top = '全面透视企业历史中标项目、中标'
           textMap.headText.bot = '金额、客户数量'
           textMap.source = 'ent_portrait_changeList'

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

@@ -435,7 +435,7 @@
                 <van-icon name="arrow"></van-icon>
               </div>
             </div>
-            <div class="buyer-statistic">
+        <div class="buyer-statistic" v-if="!isFreeOrNotLogin">
               <div class="statistic-title">统计信息</div>
               <div class="buyer-info">
                   <div class="bi-item">
@@ -466,7 +466,7 @@
             <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
           </div>
           <!-- 招标动态 -->
-          <div class="dynamic" v-if="isShow.showDynamic">
+        <div class="dynamic" v-if="isShow.showDynamic && !isFreeOrNotLogin">
 <!--              <div class="d_title">招标动态</div>-->
               <div class="selected-export-box">
                 <div class="selected-export">
@@ -505,8 +505,7 @@
           </div>
 
           <!-- 数据部分 -->
-          <div>
-
+        <div v-if="!isFreeOrNotLogin">
             <!-- 年度项目统计 -->
             <div class="years" v-if="isShow.showYearData">
                 <div class="chart_title">年度项目统计</div>

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

@@ -360,7 +360,7 @@
                     <span class="win-bid-title">企业通讯录</span>
                   </div>
                   <div class="vip_component" style="height:11.04rem;background:url('/common-module/collection/image/bg/vip_bg_9.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_free_buttonclick" @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png?v={{Msg "seo" "version"}}'></vip-component>
+                    <vip-component :islogin="isLogin" data-cl-event="c_wx_free_buttonclick" @tabactive="tabActive" :power="conf" type="item_9" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_9.png?v={{Msg "seo" "version"}}'></vip-component>
                   </div>
                 </div>
                 <div class="bg-white tab-card cell-list" v-else>
@@ -385,7 +385,7 @@
                     <p class="freeRemark">免费赠送1次【企业中标分析】权益体验机会！</p>
                     <span @click="goExpAnalysis">去解锁</span>
                 </div>
-                <div class="bg-white tab-card" data-cl-event="c_wx_open_buttionclick">
+                <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">
                         <div class="card-column">
@@ -410,6 +410,18 @@
                         <span>${entPortraitInfo.timeRangeStart ? new Date(entPortraitInfo.timeRangeStart * 1000).pattern('yyyy/MM/dd') : ''}</span>
                         <span>-</span>
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
+          </div>
+        </div>
+        <!-- 中标信息统计结果--未登录-->
+        <div class="bg-white tab-card charts"  style="margin-bottom: 10px;" v-if="isFreeOrNotLogin">
+            <div class="tab-card-title">中标信息统计结果</div>
+            <div class="vip_component" v-if="getStatus && hideDt"
+                 style="height:5.8rem;background:url('/common-module/collection/image/bg/qy-zbtj-bg.png?v={{Msg "seo" "version"}}') 40% 0 no-repeat;background-size:110% 100%;"
+            key="dt">
+            <vip-component @tabactive="tabActive" :power="conf" type="item_10" :can-free-exp="canFreeExp"
+                           :entvisit="entvisit" :newvip="isVip" :islogin="isLogin"
+                           imgurl='/common-module/collection/image/bg/qy-zbtj.png?v={{Msg "seo" "version"}}'>
+            </vip-component>
                     </div>
                 </div>
                 <div class="jy-empty" v-show="allNot && !getStatus">
@@ -418,7 +430,7 @@
                 </div>
                 <!-- 项目动态 -->
                 <div class="vip_component test" v-if="getStatus && 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 data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip"  imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_1" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip"  imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_1.png?v={{Msg "seo" "version"}}'></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">
@@ -485,7 +497,7 @@
                     <div class="tab-card-tip">注：项目金额指所有项目的中标金额之和，少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.12rem;background:url('/common-module/collection/image/bg/vip_bg_2.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_2" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_2" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_2.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && monthZbData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">月度中标金额统计</div>
@@ -501,7 +513,7 @@
                     <div class="tab-card-tip">注：少数缺失的中标金额，用项目预算补充。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_3.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_3" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_3" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_3.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts" v-if="conf._4 && mapChartData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">市场区域分布</div>
@@ -517,7 +529,7 @@
                     </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.56rem;background:url('/common-module/collection/image/bg/vip_bg_4.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_4" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png?v={{Msg "seo" "version"}}'></vip-component>
+                    <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_4" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_4.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-if="conf._4 && rateData.rows.length !== 0  && !getStatus">
                     <div class="tab-card-title">各类客户平均折扣率</div>
@@ -533,7 +545,7 @@
                     <div class="tab-card-tip">注：平均折扣率=(全部项目预算-全部中标金额)/全部项目预算，是指价格减让部分与原价的比率，仅统计预算和中标金额同时存在的项目。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.24rem;background:url('/common-module/collection/image/bg/vip_bg_5.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_5" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_5" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_5.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
                 <div class="bg-white tab-card charts"  v-show="conf._4 && entPortraitInfo.top10 && entPortraitInfo.top10.length != 0  && !getStatus">
                     <div class="tab-card-title">客户类型分布</div>
@@ -543,7 +555,7 @@
                     <div class="tab-card-tip">注：各客户类型占比以中标金额计算，最多展示占比排名前十的客户类型。</div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:11.92rem;background:url('/common-module/collection/image/bg/vip_bg_6.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_6" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_6" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_6.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
                 <div class="bg-white tab-card customers client"  v-show="conf._4 && importantCustomers.length !== 0  && !getStatus">
                     <div class="tab-card-title">重点及首次合作客户</div>
@@ -606,7 +618,7 @@
                   </div>
                 </div>
                 <div class="vip_component" v-if="getStatus" style="height:10.8rem;background:url('/common-module/collection/image/bg/vip_bg_7.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                    <vip-component data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_7" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png?v={{Msg "seo" "version"}}'></vip-component>
+                  <vip-component :islogin="isLogin" data-cl-event="c_wx_open_buttionclick" @tabactive="tabActive" :power="conf" type="item_7" :entvisit="entvisit" :can-free-exp="canFreeExp" :newvip="isVip" imgurl='{{Msg "seo" "cdn"}}/common-module/collection/image/bg/vip_ex_7.png?v={{Msg "seo" "version"}}'></vip-component>
                 </div>
             </van-tab>
         </van-tabs>