Merge branch 'dev/v4.8.39_zsy' of qmx/jy into feature/v4.8.39

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

@@ -517,3 +517,7 @@
 .win-analyse .high-link > span {
     margin-right: .08rem;
 }
+.win-analyse .default {
+    color: #999;
+}
+

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

@@ -407,6 +407,9 @@ var vNode = {
     },
     // 获取画像信息
     getEntPortrait: function (callback) {
+      if(!this.isLogin) {
+        return
+      }
       var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
       var _this = this
       var data = {
@@ -1420,6 +1423,9 @@ var vNode = {
     },
     // 高级分析设置
     goHighSet () {
+      if(!this.isLogin) {
+        return
+      }
       sessionStorage.setItem('is-click-set', 1)
       location.href = './free_high_set?header=中标信息高级分析设置&eid=' + utils.getParam('eId')
       // var url = this.getProjectNewsUrl()
@@ -1445,6 +1451,10 @@ var vNode = {
     goOpenVip: function () {
       // location.href = "/jyapp/vipsubscribe/vipsubscribe_new"
       location.href = '/jy_mobile/common/order/create/svip?type=buy'
+    },
+    // 跳转登录页
+    goLogin: function () {
+      window.location.href = "/jyapp/free/login?to=back";
     }
   }
 }

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

@@ -19,7 +19,7 @@ var vNode = {
       ], false
     ), '#FF9F40']
     return {
-      chartLoading: true,
+      chartLoading: false,
       showAll: false,
       buyer: {
         name: '',
@@ -190,7 +190,7 @@ var vNode = {
       // 免费用户是否查看过该画像
       var freeTrial = info.isFree && info.freeBuyerPort < 0 && this.freeTrial
       // 免费用户无体验次数的、超级订阅用户无剩余次数的、没有大会员浏览权限的 显示遮罩
-      return !isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial
+      return (!isFreeAuth && !isVipAuth && !isMember && !freeTrial && !vipTrial) || !this.userInfo.isLogin
     },
     // 展示免费用户体验
     getfreeBuyerPort: function () {
@@ -256,7 +256,9 @@ var vNode = {
   },
   created () {
     this.getUserSimpleInfo()
-    this.getPowerInfo()
+    setTimeout(() => {
+      this.getPowerInfo()
+    }, 1000)
     setTimeout(() => {
       this.getIsSc()
     }, 1000)
@@ -386,9 +388,13 @@ var vNode = {
             if (res.data.power.indexOf(5) === -1) {
               _this.getBuried(userType)
             }
+            if( _this.userInfo.isLogin) {
+              _this.getNewMsg(); // 中标动态
+              _this.getChartData(); // 企业画像
+            }
             _this.getUsage(); // 超级订阅用户剩余次数
-            _this.getNewMsg(); // 中标动态
-            _this.getChartData(); // 企业画像
+            // _this.getNewMsg(); // 中标动态
+            // _this.getChartData(); // 企业画像
           } else {
             _this.userInfo.isLogin = false
           }
@@ -711,6 +717,7 @@ var vNode = {
         buyer: decodeURIComponent(utils.getParam('entName'))
       }
       var isMember = this.bigStatus > 0 && this.power.indexOf(5) > -1
+      that.chartLoading = true;
       $.ajax({
         type: 'POST',
         url: isMember ? '/bigmember/portrait/buyer/getData' : '/bigmember/subVipPortrait/buyer/getData',
@@ -733,10 +740,13 @@ var vNode = {
                 that.chartLoading = false;
               }
             }
+          } else {
+            that.chartLoading = false;
           }
           that.getUsage(); // 超级订阅用户剩余次数
         },
         error: function (err) {
+          that.chartLoading = false;
           console.log(err)
           // setTimeout(function() {
           //   that.getChartData()
@@ -747,6 +757,7 @@ var vNode = {
     // 分段获取画像数据
     getSectionChartData: function (type) {
       var that = this;
+      that.chartLoading = true;
       $.ajax({
         type: 'POST',
         url: '/bigmember/portrait/buyer/getData',
@@ -775,9 +786,12 @@ var vNode = {
                 that.chartLoading = false;
               }
             }
+          } else {
+            that.chartLoading = false;
           }
         },
         error: function (err) {
+          that.chartLoading = false;
           console.log(err)
         }
       })
@@ -1715,6 +1729,9 @@ var vNode = {
       return maxIndex
     },
     goHighSet: function () {
+      if(!this.userInfo.isLogin) {
+        return
+      }
       sessionStorage.setItem('is-click-set', 1)
       location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
     },

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

@@ -382,9 +382,9 @@
           <!-- </van-sticky> -->
         </div>
         <!-- 高级分析 -->
-        <div class="win-analyse" ref="setRef" v-if="isLogin">
+        <div class="win-analyse" ref="setRef">
           <span class="win-bid-title">中标分析</span>
-          <div class="high-link" @click="goHighSet">
+          <div class="high-link" :class="isLogin ? '' : 'default'" @click="goHighSet">
             <span>高级分析设置</span>
             <van-icon name="arrow"></van-icon>
           </div>
@@ -394,7 +394,8 @@
           <div class="go-text"> 免费赠送1次【企业中标分析】权益体验机会！</div>
           <div class="go-btn" @click="goGiveAnalysis">去解锁</div>
         </div>
-        <div class="bg-white tab-card">
+        <!-- 中标信息统计结果-->
+        <div class="bg-white tab-card" v-if="isLogin">
           <div class="tab-card-title" style="padding: 0.16rem .32rem .12rem;">中标信息统计结果</div>
           <div class="card-row zb-info">
             <div class="card-column">
@@ -427,6 +428,17 @@
                 : '至今'}</span>
           </div>
         </div>
+        <!-- 中标信息统计结果--未登录-->
+        <div class="bg-white tab-card"  style="margin-bottom: 10px;" v-if="!isLogin">
+            <div class="vip_component" v-if="getStatus && hideDt"
+                 style="height:6.56rem;background:url('/common-module/collection/image/bg/qy-gk-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%;padding-top:.5rem;"
+            key="dt">
+            <vip-component @tabactive="tabActive" :power="conf" type="item_10" :can-free-exp="canFreeExp"
+                           :entvisit="entvisit" :newvip="isVip" :islogin="isLogin"
+                           imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/bg/qy-gk.png?v={{Msg "seo" "version"}}'>
+            </vip-component>
+        </div>
+        </div>
         <div class="jy-empty" v-show="allNot && !getStatus">
           <div class="jy-empty-img"></div>
           <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>

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

@@ -227,6 +227,9 @@
     .vip_openDialog{
         margin-top:.3rem;
     }
+    .win-analyse .default {
+        color: #999;
+    }
 
   </style>
 </head>
@@ -283,12 +286,12 @@
         <!-- 高级分析 -->
         <div class="win-analyse" ref="setRefs">
           <span class="win-bid-title">采购单位分析</span>
-          <div class="high-link" @click="goHighSet" v-if="isLogin">
+          <div class="high-link" :class="{default: !userInfo.isLogin}" @click="goHighSet">
             <span>高级分析设置</span>
             <van-icon name="arrow"></van-icon>
           </div>
         </div>
-        <div class="buyer-statistic">
+        <div class="buyer-statistic" v-if="userInfo.isLogin">
           <div class="statistic-title">统计信息</div>
           <div class="buyer-info">
             <div class="bi-item">
@@ -319,7 +322,7 @@
           <p class="jy-empty-text">对不起，没有匹配到相关信息， <br>修改时间范围或换个搜索词试试吧</p>
         </div>
         <!-- 招标动态 -->
-        <div class="dynamic" v-if="isShow.showDynamic">
+        <div class="dynamic" v-if="isShow.showDynamic && userInfo.isLogin">
           <!--                <div class="d_title">招标动态</div>-->
           <div class="selected-export-box">
             <div class="selected-export">
@@ -616,26 +619,35 @@
         </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%;">
+             <p class="example-title">招标动态</p>
+             <buyer-example style="margin-top:1rem;"  :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_14" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/cg-zbdt.png?v={{Msg "seo" "version"}}'></buyer-example>
+          </div>
+<!--            统计信息-->
+         <div class="vip_component" style="height:6.56rem;background:url('/common-module/collection/image/buyer/cg-gk-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+            <buyer-example style="margin-top:1rem;"  :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_13" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/cg-gk.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>
-                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.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>-->
+<!--                <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/01.png?v={{Msg "seo" "version"}}'></buyer-example>-->
+<!--              </div>-->
           <!-- 合作企业注册资本分布 -->
-          <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/09-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+          <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/09-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
                 <p class="example-title">合作企业注册资本分布</p>
                 <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_9" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/09.png?v={{Msg "seo" "version"}}'></buyer-example>
-              </div> -->
+          </div>
           <!-- 合作企业年龄分布 -->
-          <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/10-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+           <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/10-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
                 <p class="example-title">合作企业年龄分布</p>
                 <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_10" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/10.png?v={{Msg "seo" "version"}}'></buyer-example>
-              </div> -->
+           </div>
           <!-- 合作企业注册地分布 -->
-          <!-- <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/11-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
-                <p class="example-title">合作企业注册地分布</p>
+          <div class="vip_component" style="height:10.8rem;background:url('/common-module/collection/image/buyer/11-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
+<!--                <p class="example-title">合作企业注册地分布</p>-->
                 <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" :power="power" type="item_11" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/11.png?v={{Msg "seo" "version"}}'></buyer-example>
-              </div> -->
+          </div>
           <!-- 年度项目统计 -->
           <div class="vip_component"
             style="height:10.8rem;background:url('/common-module/collection/image/buyer/02-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">

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

@@ -174,6 +174,20 @@ var buyerExample = {
           textMap.source = 'buyer_portrait_topAgencyData_freeuser'
           break
         }
+        // 统计信息
+        case 'item_13': {
+          textMap.headText.top = '精准分析采购单位历史运作项目，'
+          textMap.headText.bot = '采购动态一目了然'
+          textMap.source = 'buyer_portrait_topAgencyData_freeuser'
+          break
+        }
+        // 招标动态
+        case 'item_14': {
+          textMap.headText.top = '查看采购单位最新招标动态，及时跟踪采'
+          textMap.headText.bot = '购需求'
+          textMap.source = 'buyer_portrait_topAgencyData_freeuser'
+          break
+        }
       }
       return textMap
     },

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

@@ -223,6 +223,15 @@ var vipComponent = {
           textMap.source = 'ent_portrait_contacts'
           break
         }
+        // 统计信息-概况
+        case 'item_10': {
+          textMap.titleText = ''
+          textMap.btnText = '登录查看'
+          textMap.headText.top = '全面透视企业历史中标项目、中标'
+          textMap.headText.bot = '金额、客户数量'
+          textMap.source = 'ent_portrait_changeList'
+          break
+        }
         default: {
           textMap.headText.top = '通过实时监控项目的招标、中标、合同等'
           textMap.headText.bot = '信息，全面挖掘更多潜在商机！'