Procházet zdrojové kódy

Merge branch 'dev/v4.9.55_tsz' of qmx/jy into feature/v4.9.55

汤世哲 před 9 měsíci
rodič
revize
a5f21ce9b8

+ 8 - 0
src/web/staticres/css/dataSmt/dataMart.css

@@ -57,11 +57,19 @@
   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>img {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 620px;
+  height: 130px;
+}
 
 
 .header-in-frame .jy-dataMart-search {

binární
src/web/staticres/images/dataSmt/in-frame-bg-right.png


+ 3 - 2
src/web/templates/pc/dataSmt/list.html

@@ -40,6 +40,7 @@
     <!-- 搜索结束 -->
   </header>
   <header class="header header-in-frame" style="display: none;">
+    <img src="{{Msg "seo" "cdn"}}/images/dataSmt/in-frame-bg-right.png?v={{Msg "seo" "version"}}" alt="数据超市">
     <!-- 搜索 -->
     <div class="jy-dataMart-search">
       <div class="search">
@@ -176,7 +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
+  var inIframe = window.goTemplateData?.inIframe || false
   $(function(){
     // initAdvertising()
     brightKeyword()
@@ -203,7 +204,7 @@
     $('#dataSupermarket_industry_fields').on('click',function(){
       needSubmitHandle('pc_DataSupermarket_IndustryFields')
     })
-    if(!inIframe) {
+    if(inIframe) {
       $('.no-in-frame').hide()
       $('.header-in-frame').show()
     } else {