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

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -136,6 +136,99 @@
           overflow: hidden;
           margin: 0 auto;
       }
+      .compare-dialog .mask-zz{
+          width: 6.7rem;
+      }
+      .compare-dialog .compare-dialog-head{
+          height: 1.12rem;
+          background: url("/jyapp/images/wx/pc_zzt2.png") no-repeat center center;
+          color: #171826;
+          text-align: center;
+          font-family: PingFang SC;
+          font-size: 15px;
+          font-style: normal;
+          font-weight: 400;
+          line-height: 1.12rem;
+      }
+      .compare-dialog .compare-dialog-body{
+          padding: .28rem .3rem .32rem;
+      }
+      .compare-dialog .table-box{
+          border: 1px solid #E5E5E5;
+          border-radius :6px;
+          flex-shrink: 0;
+      }
+      .compare-dialog .table-column{
+          display: flex;
+          justify-content: space-around;
+          align-items: center;
+          border-bottom: 1px solid #E5E5E5;
+
+      }
+      .compare-dialog .table-column li {
+          flex: 1;
+          height:100%;
+          text-align: center;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          color:#171826;
+          font-size: .26rem;
+          line-height: .32rem;
+
+      }
+      .compare-dialog .table-column li:not(:nth-last-child(1)){
+          border-right: 1px solid #E5E5E5;
+      }
+      .compare-dialog .table-column .free-btn-reword{
+          border-radius: 4px;
+          background: #2ABED1;
+          height: .6rem;
+          color: #FFF;
+          text-align: center;
+          font-size: .26rem;
+          padding: .1rem .12rem;
+          line-height: .4rem;
+          cursor: pointer;
+      }
+      .compare-dialog .table-column  .free-btn-experience{
+          border-radius: 4px;
+          border: 1px solid #E7C28A;
+          background: linear-gradient(270deg, #FEF0D7 0%, #FFF9F0 100%);
+          cursor: pointer;
+          color: #B1700E;
+          text-align: center;
+          font-size: .26rem;
+          line-height: .4rem;
+          padding:  .1rem .38rem;
+          margin-bottom: .08rem;
+      }
+      .compare-dialog p{
+          margin:0;
+      }
+      .compare-dialog li img {
+          width:.32rem;
+          height:.32rem;
+      }
+      .compare-dialog .split-row{
+          display: flex;
+          padding: .02rem .32rem;
+          height:.52rem;
+          justify-content: center;
+          align-items: center;
+          color: #2ABED1;
+          font-size: .24rem;
+          line-height: 18px;
+          border-bottom: 0.5px solid #E5E5E5;
+          background: #ECFCFE;
+      }
+      .blue-color {
+          color: #2ABED1 !important;
+      }
+      .gold-color {
+          color: #B1700E !important;
+      }
       .free-open-tip{
         display: flex;
         align-items: center;
@@ -723,7 +816,7 @@
                     {{end}}
                 </ul>
             </div>
-            <div class="mask-zz dialog-tip-group hidden">
+            <div class="mask-zz dialog-tip-group default-dialog hidden">
                 <div class="mask-zz">
                     <div style="position: relative">
                         <img class="dialog-top-img" src='/jyapp/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'>
@@ -737,6 +830,43 @@
                     </div>
                 </div>
             </div>
+            <div class="mask-zz dialog-tip-group compare-dialog hidden">
+                <div class="mask-zz">
+                    <div class="compare-dialog-head">
+                        <div id="compare-dialog-title">您尚未完善信息，今日查看公告权限用完啦</div>
+                    </div>
+                    <div  class="compare-dialog-body">
+                        <div class="table-box">
+                            <ul class="table-column" style="height:1.28rem;">
+                                <li style="background:#F5F6F7;font-size:.24rem;">免费注册用户</li>
+                                <li style="background-color:#2ABED1;color:#fff;font-size:.24rem;"><span style="font-size:.26rem;font-weight: bold;">免费注册用户 </span>（完善信息）</li>
+                                <li class="jump-bigmember-page" style="padding: 0;background: linear-gradient(270deg, #F4DEB1 0%, #FFF3E0 100%);color:#593913;"><span style="font-size:.26rem;font-weight: bold;">大会员</span><span style="text-decoration-line: underline;text-underline: #593913;font-size:.24rem;">大数据赋能企业 <br>数字化营销&gt;</span></li>
+                            </ul>
+                            <p class="split-row">标讯权益</p>
+                            <p style="padding: .04rem .24rem;color:#5F5E64;font-size:.26rem;line-height: .4rem;border-bottom:1px solid #E5E5E5;">可查看招标预告、招标公告、招标结果、招标信用信息</p>
+                            <p class="split-row">超前项目权益</p>
+                            <ul class="table-column" style="height:1.52rem;">
+                                <li><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                                <li><img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}\jyapp\images\icon-close.png?v={{Msg "seo" "version"}}" alt=""></li>
+                                <li class="gold-color" style="line-height:.4rem;">采购意向 <br> 拟建项目 <br>AI只能预测 </li>
+                            </ul>
+                            <p class="split-row">每日查看数量</p>
+                            <ul class="table-column" style="height:.8rem;">
+                                <li>3条</li>
+                                <li class="blue-color">不限</li>
+                                <li class="gold-color">不限</li>
+                            </ul>
+                            <ul class="table-column" style="height:1.44rem;border-bottom:0;">
+                                <li>&#x3000;</li>
+                                <li><span class="free-btn-reword">完善个人信息</span></li>
+                                <li class="gold-color"><span class="free-btn-experience">免费体验</span><span style="text-decoration-line: underline;" class="jump-customer-service">咨询客服</span></li>
+                            </ul>
+
+                            <!--                        <button class="free-btn-reword" style="background-color:  #2CB7CA;font-size: 0.32rem;color: white;border:none;width: 100%;height:0.72rem;border-radius: 0.12rem;">点击进入</button>-->
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)" adv_name="微信三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
             <div class="tab-ct">
                 <div id="tab1" style="display:none;">
@@ -1413,11 +1543,15 @@
                 $('#dialog-tip-title').text('项目提前介入，中标更轻松')
                 $(".dialog-tip-text").html('提前1-3个月获取项目信息，及早介入准备更充分')
             }
+            if(!canRead) {
+              $('.default-dialog').removeClass("hidden")
+            }
         } else {
             if (!canRead) {
-                $('#dialog-tip-title').text('免费查看更多公告')
-                $(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
-                $(".free-btn-reword").text('立即解锁')
+                // $('#dialog-tip-title').text('免费查看更多公告')
+                // $(".dialog-tip-text").html('请完善个人信息，获取更多免费查看公告权限')
+                // $(".free-btn-reword").text('立即解锁')
+                $('.compare-dialog').removeClass("hidden")
             }
             if (!canRead) {
                 $(".right-container").hide() // 收藏和关注
@@ -1431,7 +1565,7 @@
             $(".tab-ct").hide() // 正文信息
             $(".abs").hide() // 阅读原文和意见反馈
             $(".atta-list").hide() // 附件列表
-            $(".mask-zz").removeClass("hidden");
+            // $(".mask-zz").removeClass("hidden");
 
         } else {
             $(".prebuilt").css('height', 'unset')
@@ -1485,6 +1619,23 @@
         //  留资判断
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + sourceKey
     })
+    // 免费体验
+    $('.free-btn-experience').on('click', function() {
+      var sourceKey = 'app_article_member_freeuse'
+      if (utils.$envs.inH5) {
+        sourceKey = 'h5_article_member_freeuse'
+      }
+      //  留资跳转
+      location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + sourceKey
+    })
+    // 咨询客服
+    $('.jump-customer-service').on('click', function() {
+      location.href = "/jyapp/free/customer"
+    })
+    // 跳转大会员落地页
+    $('.jump-bigmember-page').on('click', function() {
+      location.href = "/jyapp/big/page/index"
+    })
 
     // 大会员文案点击
     $('.bigvip_drain').on('click', function() {
@@ -2342,7 +2493,9 @@
             if(title !==''){
                 $('.time_label').addClass('new_layout')
                 $('.tool_bottom').addClass('new_layout free_user')
-                $('.forecast').css('display','flex')
+                if(canRead) {
+                  $('.forecast').css('display','flex')
+                }
             }else{
                 $('.time_label').css({'justify-content':'space-between'})
                 $('.tool_bottom').css({'justify-content':'space-between'})

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -18,7 +18,7 @@ var titleMap = {
   'jyarticle_see3_plus_wx':'完善信息',
   'ent-manage-app': '欢迎体验剑鱼标讯商机管理',
   'jypush_see10_plus_app':'完善信息',
-  'jyarticle_see3_plus_app':'完善信息',
+  'jyarticle_see3_plus_app':'免费享无限次查看标讯体验',
 
   'article_collection': '完善信息',
   'article_original': '完善信息',
@@ -45,6 +45,10 @@ var titleMap = {
   wx_search_dzhfxbg: '欢迎体验剑鱼大会员',
   app_analysis_ProjectDetails: '欢迎体验剑鱼大会员',
   wx_analysis_ProjectDetails: '欢迎体验剑鱼大会员',
+  // 标讯详情免费用户--免费体验
+  app_article_member_freeuse: '免费体验大会员功能权益',
+  h5_article_member_freeuse: '免费体验大会员功能权益',
+  wx_article_member_freeuse: '免费体验大会员功能权益',
 
   // 数据超市列表-申请数据定制
   app_DataSupermarket_Customization: '量身定制数据解决方案',
@@ -57,7 +61,7 @@ var titleMap = {
   // 数据超市详情-申请数据定制
   app_supermarket_details_customization: '量身定制数据解决方案',
   wx_supermarket_details_customization: '量身定制数据解决方案',
-  h5_supermarket_details_customization: '量身定制数据解决方案'
+  h5_supermarket_details_customization: '量身定制数据解决方案',
 }
 
 // tip
@@ -95,6 +99,8 @@ var tipMap = {
 
   article_original: '为给您匹配精准的推荐信息，请完善个人信息，免费查看原文',
   article_collection: '重要项目一键创建标签收藏！请完善个人信息，为您匹配精准服务',
+  // 标讯详情免费用户--免费体验
+  article_member_freeuse: '请升级大会员无限制查看标讯、超前项目，优先对接项目负责人，抢占绝对先机！',
   member_attach: '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
   member_freeuse: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
   month_: '请留下联系方式，我们会尽快联系您！体验市场分析周报/月报！',
@@ -125,7 +131,7 @@ var tipMap = {
   'jypush_see10_plus_wx':'请完善个人信息，为您匹配更多精准项目信息',
   'jypush_see10_plus_app':'请完善个人信息，为您匹配更多精准项目信息',
   'jyarticle_see3_plus_wx':'请完善个人信息，获取更多免费查看公告权限',
-  'jyarticle_see3_plus_app':'请完善个人信息，获取更多免费查看公告权限',
+  'jyarticle_see3_plus_app':'请完善个人信息，即刻享无限次查看标讯的权益，如需查看超前项目请联系客服：400-108-6670',
 
   'certificateServices-': '请留下联系方式，我们会尽快联系您！',
   peugeot_supplier_regist:'请完善您的个人信息，抢先对接采购单位',
@@ -900,16 +906,17 @@ var vNode = {
       sessionStorage.removeItem('salesBackStatus')
       history.back()
     },
-      showMessage: function (msg, confirmText, callback) {
+      showMessage: function (msg, confirmText, callback, title) {
         var message = msg || '您的申请已提交，我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
         this.$dialog.close()
         this.$dialog.confirm({
+          title: title || '',
           message: message,
           className: 'ent-search-dialog max-54',
           overlayClass: 'z-2030',
           showCancelButton: false,
           getContainer: '.perfect-info-group',
-          confirmButtonText: confirmText || '我知道了',
+          confirmButtonText: confirmText || '我知道了'
         }).then(function () {
           if (callback) {
             callback()
@@ -987,7 +994,9 @@ var vNode = {
                 break
               }
               case 'jyarticle_see3_plus_app': {
-                _this.showToast('提交成功')
+                _this.showMessage('您已获得无限次免费查看标讯的权益，如需查看超前项目请联系客服：400-108-6670', '确定', function () {
+                  history.back()
+                }, '提交成功')
                 setTimeout(function () {
                   sessionStorage.setItem('salesBackStatus', 'true')
                   history.back()
@@ -1050,7 +1059,15 @@ var vNode = {
               case 'h5_supermarket_details_customization': {
                 _this.showMessage('我们的客户经理会在24小时内尽快与您联系。', '我知道了', function () {
                   history.back()
-                })
+                },)
+                break
+              }
+              case 'app_article_member_freeuse':
+              case 'h5_article_member_freeuse':
+              case 'wx_article_member_freeuse': {
+                _this.showMessage('已收到您提交的免费体验大会员申请，我们会尽快联系您并预约演示时间。', '确定', function () {
+                  history.back()
+                }, '提交成功')
                 break
               }
               default: {