Merge branch 'feature/v4.8.69' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.69_wmh

src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -110,10 +110,11 @@
   text-align: center;
   background-position: top center;
   background-repeat: no-repeat;
-  background-image: url('/common-module/pc-dialog/image/structed-title.png?v={{Msg "seo" "version"}}');
-  background-size: 100% 250px;
+  /* background-image: url('/common-module/pc-dialog/image/structed-title.png?v={{Msg "seo" "version"}}'); */
+  background-size: 100% 100%;
 }
 #collectUserInfoDialog .dialog-content{
+  width: calc(100% - 4px);
   margin-top: -1px;
   padding: 0 32px 32px;
   border-radius: 0 0 8px 8px;
@@ -291,7 +292,8 @@
   display: none;
 }
 .el-input.is-active .el-input__inner,
-.el-input__inner:focus{
+.el-input__inner:focus,
+.el-textarea__inner:focus{
   border-color: #2CB7CA;
 }
 .el-select .el-input.is-focus .el-input__inner,

src/web/staticres/css/dataSmt/dataMart.css

@@ -403,7 +403,7 @@
   width: calc(100% - 3px);
   margin: auto;
   margin-top: 16px;
-  height: 560px;
+  height: 500px;
   overflow-y:auto;
   padding: 0 4px;
 }
@@ -465,4 +465,23 @@ color: #1D1D1D;
  .dataMart_dialog table .values{
   width: calc(100% - 140px);
   text-align: left;
+ }
+ .additional-remarks{
+  display: flex;
+  margin: 8px 32px 0;
+  padding: 5px 16px;
+  background: rgba(255, 159, 64, 0.08);
+  border-radius: 4px;
+  color: rgba(245, 101, 0, 1);
+  font-size: 14px;
+  line-height: 22px;
+  text-align: justify;
+ }
+ .additional-remarks img{
+  margin: 2px 4px 0 0;
+ }
+ .additional-remarks .light-text{
+  color: #2ABED1;
+  text-decoration: underline;
+  cursor: pointer;
  }

src/web/staticres/css/dataSmt/dataMart_detail.css

@@ -302,3 +302,23 @@
   line-height: 18px;
   color: rgba(104, 104, 104, 1);
 }
+.additional-remarks{
+  display: flex;
+  margin-bottom: 8px;
+  justify-content: center;
+  padding: 5px 16px;
+  background: rgba(255, 159, 64, 0.08);
+  border-radius: 4px;
+  color: rgba(245, 101, 0, 1);
+  font-size: 14px;
+  line-height: 22px;
+  text-align: center;
+ }
+ .additional-remarks img{
+  margin: 2px 4px 0 0;
+ }
+ .additional-remarks .light-text{
+  color: #2ABED1;
+  text-decoration: underline;
+  cursor: pointer;
+ }

src/web/staticres/dataSmt/css/index.css

@@ -391,18 +391,26 @@ a:focus{
 .data-scene .scene-item:nth-child(4){
   background-image: url(/dataSmt/images/scene-item-4.png);
 }
+.data-scene .scene-btn-container{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 40px 0 0;
+}
 .data-scene .scene-btn{
   width: 240px;
   height: 48px;
   line-height: 48px;
-  margin: 48px auto 0;
-  background-color: #fff;
   border-radius: 8px;
   text-align: center;
   cursor: pointer;
+  font-size: 20px;
 }
-
-.data-scene .scene-btn > span{
+.data-scene .consult-btn{
+  background-color: #fff;
+  margin-right: 72px;
+}
+.data-scene .consult-btn > span{
   /* background: linear-gradient(#33CCCC, #3399FF);
   -webkit-background-clip: text;
   -moz-background-clip:text;
@@ -417,6 +425,10 @@ a:focus{
   background: url(/dataSmt/images/zixun-font.png) no-repeat center center;
   background-size: contain;
 }
+.data-scene .download-btn{
+  color: #fff;
+  background: linear-gradient(to right,rgba(42, 190, 209, 1),rgba(54, 135, 255, 1));
+}
 
 .btn-light{
   position: relative;

src/web/staticres/js/biddingSearch.js

@@ -349,6 +349,11 @@ function toPaydataExport(){
 		$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
 		$("#bidLogin").modal("show");
 	}else{
+    // 列表如果没有数据 点击数据导出不能执行后续操作
+    if (!$('.hasNoData').is(':hidden') || !$('.working').is(':hidden')) {
+      console.log('列表没有数据，不能数据导出');
+      return
+    }
     //已登录跳转订单支付页面
     var selectIds = ""
     var idText = ""

src/web/templates/dataMarket/index.html

@@ -276,11 +276,11 @@
           <p>超前商机项目、<br>下一阶段采购项目预测</p>
         </li>
       </ul>
-      <div class="scene-btn" onClick="needSubmitHandle('pc_market_ApplicationScenario')">
-        <span id="consult-scene-btn">
-          <!-- 立即咨询 -->
-        </span>
+      <div class="scene-btn-container">
+        <div class="scene-btn consult-btn" id="consult-scene-btn" onClick="needSubmitHandle('pc_market_ApplicationScenario')"><span></span></div>
+        <div class="scene-btn download-btn" id="download-btn" onClick="needSubmitHandle('pc_market_AnalysisCase')">免费下载行业案例</div>
       </div>
+      
     </div>
   </div>
   {{include "/common/pcbottom.html"}}

src/web/templates/pc/dataExport_sieve.html

@@ -1586,7 +1586,7 @@
     $progress.scrollIntoView()
     sessionStorage.setItem('refresh', '1')
     let redirectUrl = '/front/dataExport/toCreateOrderPage/' + dataNode._data.dataInfo._id
-    window.location.href = redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
+    window.location.href = location.origin + redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
   })
 	function isIE(){
 		if(!!window.ActiveXObject || "ActiveXObject" in window){

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

@@ -82,6 +82,12 @@
     </div>
     <h2 class="title">数据示例</h2>
     <div class="table_content">
+      <p class="additional-remarks">
+        <img src='{{Msg "seo" "cdn"}}/images/dataSmt/icon-tips.png?v={{Msg "seo" "version"}}' width="18" height="18" alt="">
+        <span>
+          以下数据示例仅为部分字段，如需更多行业字段，如资金来源、报价方式、企业资质、人员资质、业绩资格、企业信用、建设规模等字段，您可<em class="light-text" id="detail_industry_fields">申请数据定制＞</em>
+        </span> 
+      </p>
       <p class="tableDescriptions">{{.T.data.describe}}</p>
       <div class="table_img" id="galley">
         <!-- 表格图片 -->
@@ -89,10 +95,12 @@
       </div>
     </div>
     {{if .T.data.application}}
-    <h2 class="title">数据应用</h2>
-    <div class="table_content">
-      <div class="table_img" id="data_application">
-        <img data-original="{{.T.data.application}}?v={{Msg "seo" "version"}}" src="{{.T.data.application}}?v={{Msg "seo" "version"}}">
+    <div style="padding: 64px 0 36px;">
+      <h2 class="title">数据应用</h2>
+      <div class="table_content">
+        <div class="table_img" id="data_application">
+          <img data-original="{{.T.data.application}}?v={{Msg "seo" "version"}}" src="{{.T.data.application}}?v={{Msg "seo" "version"}}">
+        </div>
       </div>
     </div>
     {{end}}
@@ -144,6 +152,14 @@
     $('.dataMart_detail .dataCustomization a').on('click',function(){ // 数据定制
       needSubmitHandle('pc_supermarket_details_customization', {{.T.data.name}}) // 此处第二个参数添加模板变量产品名称
     })
+    // 数据示例模块-行字字段说明申请定制留资
+    $('#detail_industry_fields').on('click', function() {
+      needSubmitHandle('pc_supermarket_details_IndustryFields') 
+    })
+    // 数据应用模块-免费获取更多行业客户案例留资
+    $('#data_application img').on('click', function() {
+      needSubmitHandle('pc_supermarket_details_AnalysisCase') 
+    })
     $('.dataMart_detail .consult').on('click',function(){
        if (!loginflag) {
         return openLoginDig()

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

@@ -18,7 +18,7 @@
   <link href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
   <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet">
   <link href='{{Msg "seo" "cdn"}}/common-module/pc-dialog/css/leave-info-dialog.css?v={{Msg "seo" "version"}}' rel="stylesheet">
-  <link href='{{Msg "seo" "cdn"}}/css/dataSmt/dataMart.css?v={{Msg "seo" "version"}}' rel="stylesheet" type="text/css" />
+  <link href='{{Msg "seo" "cdn"}}/css/dataSmt/dataMart.css?v={{Msg "seo" "version"}}11' rel="stylesheet" type="text/css" />
   <style>
   </style>
 </head>
@@ -116,6 +116,12 @@
   <div class="content">
     <img src="{{Msg "seo" "cdn"}}/images/dataSmt/close.png?v={{Msg "seo" "version"}}" alt="close" class="close_">
     <h4>包含字段说明</h4>
+    <p class="additional-remarks">
+      <img src='{{Msg "seo" "cdn"}}/images/dataSmt/icon-tips.png?v={{Msg "seo" "version"}}' width="18" height="18" alt="">
+      <span>
+        以下数据示例仅为部分字段，如需更多行业字段，如资金来源、报价方式、企业资质、人员资质、业绩资格、企业信用、建设规模等字段，您可<em class="light-text" id="dataSupermarket_industry_fields">申请数据定制＞</em>
+      </span> 
+    </p>
     <div class="table_box">
       <table>
         <thead>
@@ -170,6 +176,9 @@
     $('.dataMart  .advertising_close').on('click',function(){
       $('.dataMart .dataMart_advertising').hide()
     })
+    $('#dataSupermarket_industry_fields').on('click',function(){
+      needSubmitHandle('pc_DataSupermarket_IndustryFields')
+    })
   })
   function initAdvertising(){
     var windowHeight = $(window).height(); // 可视窗口的高度