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

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

@@ -176,8 +176,9 @@
   background-size: 100% 100%;
   box-sizing: border-box;
   padding-top: 54px;
+  position: relative;
 }
-.dataMart_detail .middle .coreAdvantage .item .box:hover{
+.dataMart_detail .middle .coreAdvantage .item:hover .box{
   box-shadow: 0px 4px 20px 0px #001A411F;
 
 }
@@ -186,6 +187,17 @@
   height: 100%;
   border-radius: 16px;
   overflow: hidden;
+  background-size: 100% 100%;
+  background-image: url(/images/dataSmt/bg_.png);
+}
+.dataMart_detail .middle .coreAdvantage .pos-img{
+  width: 140px;
+  height: 140px;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 0;
 }
 .dataResource{
   background-image: url(/images/dataSmt/data.png);

src/web/staticres/public-pc/js/pc-bottom.js

@@ -197,7 +197,7 @@ $(function () {
     var scrollDisBottom = hHeight - getDomScreenHeight() - $(window).scrollTop()
     if (scrollDisBottom <= goBackTop_disBottom) {
       sideDom.css({
-        bottom: (goBackTop_disBottom - scrollDisBottom) + 'px'
+        bottom: (goBackTop_disBottom - scrollDisBottom) + 100 + 'px'
       })
     } else {
       sideDom.css({

src/web/templates/common/pcbottom.html

@@ -129,7 +129,7 @@
 </div>
 
 <!--S-侧边栏-->
-<div class="right-side-box" data-backside>
+<div class="right-side-box right-side-box-only" data-backside>
 <!--      <div id="shareslider" style="width: 88px"></div>-->
     <div id="sideIcon" class="" style="right: 1px;width: 88px;height: 88px;">
 <!--        <a href="/swordfish/frontPage/share/sess/index"><img src="{{Msg "seo" "cdn"}}/share/img/active-icon.png"  alt="" style="width: 88px;"></a>-->

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

@@ -51,25 +51,29 @@
   <section class="middle">
     <h1 class="title">核心优势</h1>
     <div class="coreAdvantage">
-      <div class="item dataResource">
+      <div class="item">
+        <div class="pos-img dataResource"></div>
         <div class="box">
           <h1>数据资源多</h1>
           <p>专注招投标大数据行业8年，拥有千亿级招投标数据库。</p>
         </div>
       </div>
-      <div class="item coverageArea">
+      <div class="item">
+        <div class="pos-img coverageArea"></div>
         <div class="box">
           <h1>覆盖范围广</h1>
           <p>招标信息实时更新，100%行业和地区覆盖。</p>
         </div>
       </div>
-      <div class="item service">
+      <div class="item">
+        <div class="pos-img service"></div>
         <div class="box">
           <h1>服务更全面</h1>
           <p>7*24小时全面售后，专属客户经理对接，享优质服务。</p>
         </div>
       </div>
-      <div class="item professionalTeam">
+      <div class="item">
+        <div class="pos-img professionalTeam"></div>
         <div class="box">
           <h1>团队更专业</h1>
           <p>拥有专业资深数据服务团队、成熟的数据模型可快速交付。</p>

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

@@ -7,7 +7,7 @@
   <meta name="Keywords" content="{{.T.keywords}}"/>
   <meta name="Description" content="{{.T.description}}" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <meta name="renderer" content="webkit" >
+  <meta name="renderer" content="webkit">
   <meta name="format-detection" content="telephone=no"/>
   <meta name="enable-header" theme="light" content="数据超市"/>
   {{include "/common/pnc.html"}}
@@ -255,6 +255,8 @@
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
 <!--E-百度统计-->
+<script>
+</script>
 </body>
 </html>