Merge branch 'dev/v4.8.33_wmh' of qmx/jy into feature/v4.8.33

src/web/templates/pc/dataSmt/detail.html

@@ -34,7 +34,7 @@
     </div>
     <p class="desc">产品概述：数据介绍，包含数据可购买时间、格式、用途等XX，可参考千里马</p>
     <div class="button_box">
-      <button class="consult open-customer" id="consult_">立即咨询</button>
+      <button class="consult" id="consult_">立即咨询</button>
       <button class="purchase" id="purchase_">申请购买</button>
       <p class="dataCustomization">如不满足您的需求，您可<a class="highlight" id="dataCustomization_">申请数据定制＞</a></p>
     </div>
@@ -73,14 +73,14 @@
       <p class="tableDescriptions">包含字段：省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯地址、项目名称、项目范围、预算金额、中标金额、开标日期、采购单位信息(采购单位名称、采购单位联系人、采购单位联系电话）、招标代理机构、中标单位信息(中标单位名称、中标单位联系人、中标单位联系电话)(来源:招标公告网站)、中标单位信息(中标单位联系人、中标单位联系电话、电子邮箱)(来源:国家企业公示网站）</p>
       <div class="table_img" id="galley">
         <!-- 表格图片 -->
-        <img data-original="{{Msg "seo" "cdn"}}/images/dataSmt/table.png?v={{Msg "seo" "version"}}" src="{{Msg "seo" "cdn"}}/images/dataSmt/table.png?v={{Msg "seo" "version"}}" alt="">
+        <img data-original="{{Msg "seo" "cdn"}}/images/dataSmt/table.png?v={{Msg "seo" "version"}}" src="{{Msg "seo" "cdn"}}/images/dataSmt/table.png?v={{Msg "seo" "version"}}" alt="表格">
       </div>
     </div>
   </section>
   <!-- 底部广告位 -->
   <footer class="foot_"> 
     <a href="">
-      <img src="{{Msg "seo" "cdn"}}/images/dataSmt/foot_bg.png?v={{Msg "seo" "version"}}" alt="">
+      <img src="{{Msg "seo" "cdn"}}/images/dataSmt/foot_bg.png?v={{Msg "seo" "version"}}" alt="底部广告">
     </a>
   </footer>
 </div>
@@ -94,13 +94,20 @@
 <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/pc-dialog/js/leave-info-dialog.js?v={{Msg "seo" "version"}}'></script>
 <script>
+  haslogin({{.T.logid}});
   $(function(){
     $('.dataMart_detail .purchase').on('click',function(){ // 购买
-      needSubmitHandle('pc_supermarket_details_buy','数据超市详情-申请购买',)
+      needSubmitHandle('pc_supermarket_details_buy','数据超市详情-申请购买','') // 此处第二个参数添加模板变量产品名称
     })  
 
     $('.dataMart_detail .dataCustomization a').on('click',function(){ // 数据定制
-      needSubmitHandle('pc_supermarket_details_customization','数据超市详情-申请数据定制',)
+      needSubmitHandle('pc_supermarket_details_customization','数据超市详情-申请数据定制','') // 此处第二个参数添加模板变量产品名称
+    })
+    $('.dataMart_detail .consult').on('click',function(){ 
+       if (!loginflag) {
+        return openLoginDig()
+       }
+       goCustomerUrl({ openNewWindow: true })
     })  
   }) 
   function needSubmitHandle (source, name){

src/web/templates/pc/dataSmt/list.html

@@ -137,7 +137,7 @@
   <!-- 底部广告位 -->
   <footer class="dataMart_advertising">
     <a href="">
-      <img class="advertising" src="{{Msg "seo" "cdn"}}/images/dataSmt/foot_bg.png?v={{Msg "seo" "version"}}" alt="">
+      <img class="advertising" src="{{Msg "seo" "cdn"}}/images/dataSmt/foot_bg.png?v={{Msg "seo" "version"}}" alt="底部广告">
     </a>
     <!-- 关闭按钮 -->
     <img class="advertising_close" src="{{Msg "seo" "cdn"}}/images/dataSmt/close_w.png?v={{Msg "seo" "version"}}" alt="close">
@@ -195,6 +195,7 @@
 <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/pc-dialog/js/leave-info-dialog.js?v={{Msg "seo" "version"}}'></script>
 <script>
+  haslogin({{.T.logid}});
   $(function(){
     initAdvertising()
     $(window).scroll(function() {
@@ -204,7 +205,7 @@
       $(this).addClass('active').siblings().removeClass('active')
     }) 
     $('.dataMart .dataCustomization').on('click',function(){
-      needSubmitHandle('pc_supermarket_Noresults_customization','数据超市搜索无结果-申请数据定制',)
+      needSubmitHandle('pc_supermarket_Noresults_customization')
       // if(!loginflag){
       //   location.href = '/notin/page?close_goBack=1'
       // }else{