Browse Source

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

汤世哲 9 months ago
parent
commit
fe39a6c5a0

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

@@ -63,12 +63,16 @@
   background: url(/images/dataSmt/in-frame-bg.png) no-repeat;
   background-size: 100% 100%;
 }
-.dataMart .header.header-in-frame>img {
+
+.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;
 }
 
 
@@ -80,7 +84,9 @@
   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 {
@@ -95,6 +101,7 @@
 }
 
 .dataMart .header-in-frame  .hotkeywords {
+  position: relative;
   margin-top: 0;
   margin: unset;
   height: 40px;

+ 1 - 1
src/web/templates/pc/dataSmt/list.html

@@ -40,7 +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="header-in-frame-right"></div>
     <!-- 搜索 -->
     <div class="jy-dataMart-search">
       <div class="search">