Merge branch 'feature/v4.8.0' of http://192.168.3.207:8080/qmx/jy into feature/v4.8.0

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

@@ -2,6 +2,14 @@
   width: 1000px;
   margin: 0 auto;
 }
+.data-market-ad-bottom img{
+  max-height:80px;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 999;
+}
 .apply-btn{
   width: 240px;
   height: 52px;

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

@@ -91,6 +91,11 @@
       </div>
     </section>
   </section>
+  {{range $k,$v:=Ad "jy-pc-dataInterface-bottom" -1 .Host}}
+  <div class="data-market-ad-bottom">
+    <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+  </div>
+  {{end}}
 </div>
 {{include "/common/pcbottom.html"}}
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
@@ -102,6 +107,10 @@
     haslogin();
     // 模块文案上浮
     animateUp();
+
+    windowScrollFn();
+    $(window).on('scroll', windowScrollFn);
+    $(window).on('resize', windowScrollFn);
   });
   // 留资
   function leaveInfoHandle (){
@@ -150,6 +159,24 @@
       judgeTop();
     });
   };
+  function windowScrollFn () {
+    // 底部横幅固定
+    var stickyFooter = $('.data-market-ad-bottom');
+    // 吸底
+    // 如果距离底部
+    var bottomFooter = $('.j-bottom');
+    var ob = { top: 0 };
+    if (bottomFooter.length) {
+      ob = bottomFooter[0] && bottomFooter[0].getBoundingClientRect();
+    }
+    // bottom出现在视口
+    var bottom = window.innerHeight - ob.top;
+    if (bottom > 0 && ob.top !== 0) {
+      stickyFooter.css({ bottom: parseInt(bottom) });
+    } else {
+      stickyFooter.css({ bottom: 0 });
+    }
+  };
 </script>
 </body>
 </html>

src/web/templates/dataMarket/index.html

@@ -203,7 +203,7 @@
   }
   //跳转到数据定制导出营销落地页
   function jumpCustomExport () {
-    location.href = "/swordfish/frontPage/customExport/free/index"
+    location.href = "/front/dataMarket/customExport"
   }
 </script>
 </body>