Merge branch 'master' into hotfix/v4.9.43.8

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

@@ -3,6 +3,113 @@
   width: 100%;
 }
 
+.in-iframe .dataMart {
+  padding: 24px;
+}
+.in-iframe .dataMart .middle {
+  margin-top: 16px;
+  background: #fff;
+  border-radius: 8px;
+}
+
+.in-iframe .dataMart .list_container {
+  padding: 24px 32px 80px;
+  background: #fff;
+}
+.in-iframe .dataMart .list_container .list_content {
+  width: auto;
+}
+.in-iframe .dataMart .list_container .cornerMark {
+  border-radius: 8px 0px 16px 0px;
+}
+.in-iframe .dataMart .list_container .list .item {
+  border: 1px solid #ECECEC;
+  border-radius: 8px;
+}
+.in-iframe .dataMart .middle .tabs_box {
+  position: relative;
+  padding: 0 32px;
+  justify-content: flex-start;
+  height: 53px;
+  width: auto;
+  line-height: 53px;
+  border-bottom: 1px solid #ECECEC;
+}
+.in-iframe .dataMart .middle .tabs_box .keys_desc {
+  position: absolute;
+  right: 32px;
+}
+.in-iframe .dataMart .middle .tabs_box>div {
+  margin-left: 16px;
+  width: 904px;
+  height: 100%;
+  justify-content: normal;
+}
+.in-iframe .dataMart .middle .tabs_box>div a {
+  line-height: 53px;
+  padding: 0;
+  margin: 0 16px;
+}
+.in-iframe .dataMart .middle .tabs_box>div .active {
+  border-bottom: 2px solid #2ABED1;
+  color: #2ABED1;
+  border-radius: initial;
+  background-color: unset;
+}
+.header-in-frame {
+  position: relative;
+  padding: 24px 0 24px 32px;
+  height: 130px;
+  background: url(/images/dataSmt/in-frame-bg.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.dataMart .header.header-in-frame .header-in-frame-right {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 620px;
+  height: 130px;
+  background: url(/images/dataSmt/in-frame-bg-right.png) no-repeat;
+  background-size: 100% 100%;
+  pointer-events: none;
+}
+
+
+.header-in-frame .jy-dataMart-search {
+  position: unset;
+  width: 1200px;
+  transform: none;
+  background: transparent;
+  z-index: 1;
+}
+.header-in-frame .jy-dataMart-search .ser {
+  width: 692px;
+  height: 42px;
+  border: 2px solid #2ABED1;
+}
+
+.header-in-frame .jy-dataMart-search .btn {
+  width: 128px;
+  height: 42px;
+  background: #2CB7CA;
+  font-size: 18px;
+}
+
+.header-in-frame .jy-dataMart-search .search {
+  margin: unset;
+}
+
+.dataMart .header-in-frame  .hotkeywords {
+  position: relative;
+  margin-top: 0;
+  margin: unset;
+  height: 40px;
+}
+.dataMart .header-in-frame  .hotkeywords .content {
+  line-height: 39px;
+}
+
 .dataMart .header img {
   width: 100%;
 }
@@ -484,4 +591,38 @@ color: #1D1D1D;
   .dataMart .dataMart_dialog .content .table_box{
     height: 400px;
   }
+}
+
+@media screen and (max-width: 1248px) {
+  .dataMart {
+    overflow: hidden;
+  }
+  .dataMart .tabs_box {
+    width: 1012px;
+  }
+  .in-iframe .dataMart .middle .tabs_box>div {
+    margin-left: 0;
+    width: auto;
+  }
+  .dataMart .tabs_box div a {
+    padding: 8px 16px;
+  }
+  .dataMart .list_container {
+    width: auto;
+    margin: 20px auto 0;
+  }
+  .dataMart .list_container .list_content {
+    width: auto;
+  }
+  .dataMart .list_container .list_content .list .item {
+    margin-right: 20px;
+    margin-bottom: 20px;
+    width: 296px;
+  }
+  .dataMart .list_container .list_content .list .item:nth-child(3n) {
+    margin-right: 0;
+  }
+  .dataMart .dataMart_pagination {
+    transform: translateX(-12px);
+  }
 }

src/web/staticres/frontRouter/pc/customExport/css/index.css

@@ -512,7 +512,28 @@ h2.title{
   left: 200%;
 }
 
-
+@media screen and (max-width: 1460px) {
+  .w1200 {
+    width: 1012px;
+  }
+  .custom-report-box-b .content .con-row {
+    width: 235px;
+    height: 240px;
+  }
+  .custom-process-box .con-row {
+    padding: 0;
+    
+  }
+  .custom-process-box .con-row:nth-of-type(4) {
+    padding: 0;
+  }
+  .industry-solution-box .content {
+    padding-left: 24px;
+  }
+  .custom-process-box .dot-line {
+    left: 140px;
+  }
+}
 
 
 

src/web/staticres/frontRouter/pc/my_data_packet/css/index-pc.css

@@ -314,4 +314,11 @@
 
 .exports .el-table::before {
     height: 0;
+}
+
+/* 媒体查询 */
+@media screen and (max-width: 1460px) {
+  .data-box {
+    width: 1012px;
+  }
 }

src/web/staticres/frontRouter/pc/my_data_packet/js/index-pc.js

@@ -41,7 +41,7 @@ var vm = new Vue({
 		}
       },
       goBuyPage () {
-        location.href = '/front/dataPack/createOrder'
+        window.open('/front/dataPack/createOrder', '_blank')
       },
       tabClick() {
         this.setUrlQuery()

src/web/templates/dataMarket/customExport/index.html

@@ -224,8 +224,8 @@
                   <img src='{{Msg "seo" "cdn"}}/frontRouter/pc/customExport/image/solution-logo11.png?v={{Msg "seo" "version"}}'>
                   <img src='{{Msg "seo" "cdn"}}/frontRouter/pc/customExport/image/solution-logo12.png?v={{Msg "seo" "version"}}'>
                 </div>
+                <div class="data-demo-btn btn-light"  onClick="needSubmitHandle('pc_data_custom_export')">获取数据样例</div>
               </div>
-              <div class="data-demo-btn btn-light"  onClick="needSubmitHandle('pc_data_custom_export')">获取数据样例</div>
             </div>
           </div>
           <div class="swiper-slide swiper5 bg-cover">

src/web/templates/frontRouter/pc/docs/sess/index.html

@@ -69,6 +69,14 @@
             margin: 0 auto;
             min-width: 1200px;
         }
+       .in-iframe .w1200 {
+          width: auto!important;
+          min-width: auto!important;
+       }
+       .in-iframe.page--docs--index .page-container {
+          background-color: rgb(242, 242, 244)!important;
+          padding: 24px!important;
+       }
     </style>
 </head>
 <body class="page--docs--index">

src/web/templates/frontRouter/pc/xspc/sess/index.html

@@ -56,6 +56,9 @@
             margin: 0 auto;
             min-width: 1200px;
         }
+        .page--jyxspc--index.in-iframe .page-container {
+            padding-top: 0;
+        }
     </style>
 </head>
 <body class="page--jyxspc--index">

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

@@ -22,11 +22,11 @@
   <style>
   </style>
 </head>
-<body>
+<body class="in-iframe" style="background-color: transparent;">
 {{include "/common/pchead.html"}}
 
 <div class="dataMart">
-  <header class="header">
+  <header class="header no-in-frame" style="display: none;">
     <img src="{{Msg "seo" "cdn"}}/images/dataSmt/banner.jpg?v={{Msg "seo" "version"}}" alt="数据超市,提供海量热门行业数据，专业安全合规,成品数据一键下载。">
     <!-- 搜索 -->
     <div class="jy-dataMart-search">
@@ -39,9 +39,33 @@
     </div>
     <!-- 搜索结束 -->
   </header>
+  <header class="header header-in-frame" style="display: none;">
+    <div class="header-in-frame-right"></div>
+    <!-- 搜索 -->
+    <div class="jy-dataMart-search">
+      <div class="search">
+        <form method="get" action="/datasmt/{{.T.dataType}}_1" class="form-search" id="dataMartForm"  onsubmit="return false;">
+          <input class="ser" onkeydown="onkeydowndataMart()" autocomplete="off"  type="text" name="searchValue" placeholder="请输入业务范围，如：物业管理" value="{{.T.searchValue}}"/>
+          <button class="btn" onclick="dataMartSearch()">搜 索</button>
+        </form>
+      </div>
+    </div>
+    <!-- 搜索结束 -->
+    {{$dataType := .T.dataType}}
+    <!-- 热搜词 -->
+    <section class="hotkeywords">
+      <p><img src="{{Msg "seo" "cdn"}}/images/dataSmt/hot_icon.png?v={{Msg "seo" "version"}}" alt="热搜icon">热搜：</p>
+      <div class="content">
+        {{range $k,$v := .T.hotKeys}}
+        <a href="/datasmt/{{$dataType}}_1?searchValue={{$v}}">{{$v}}</a>
+        {{end}}
+      </div>
+    </section>
+    <!-- 热搜词结束 -->
+  </header>
   {{$dataType := .T.dataType}}
   <!-- 热搜词 -->
-  <section class="hotkeywords">
+  <section class="hotkeywords no-in-frame" style="display: none;">
     <p><img src="{{Msg "seo" "cdn"}}/images/dataSmt/hot_icon.png?v={{Msg "seo" "version"}}" alt="热搜icon">热搜：</p>
     <div class="content">
       {{range $k,$v := .T.hotKeys}}
@@ -153,6 +177,7 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/pc-dialog/js/leave-info-dialog.js?v={{Msg "seo" "version"}}'></script>
 <script>
   haslogin({{.T.logid}});
+  var inIframe = window.goTemplateData?.inIframe || false
   $(function(){
     // initAdvertising()
     brightKeyword()
@@ -179,6 +204,13 @@
     $('#dataSupermarket_industry_fields').on('click',function(){
       needSubmitHandle('pc_DataSupermarket_IndustryFields')
     })
+    if(inIframe) {
+      $('.no-in-frame').hide()
+      $('.header-in-frame').show()
+    } else {
+      $('.no-in-frame').show()
+      $('.header-in-frame').hide()
+    }
   })
   function initAdvertising(){
     var windowHeight = $(window).height(); // 可视窗口的高度
@@ -202,8 +234,9 @@
   }
   var  isNull =  {{.T.dataType}}=="index"
   function dataMartSearch(){
-    var val_ = $('#dataMartForm .ser').val().replace(/\s+/g, "")
-    $('#dataMartForm .ser').val(val_)
+    const serDom = inIframe ? $('.header-in-frame #dataMartForm .ser') : $('#dataMartForm .ser')
+    var val_ = serDom.val().replace(/\s+/g, "")
+    serDom.val(val_)
     if(!val_){
       if (isNull) {
         window.location.replace("/datasmt/index")