Переглянути джерело

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

tsz 2 роки тому
батько
коміт
6d2db3a2e5

+ 1 - 1
src/web/staticres/frontRouter/pc/dataInterface/css/index.css

@@ -3,7 +3,7 @@
   margin: 0 auto;
 }
 .data-market-ad-bottom img{
-  max-height:80px;
+  max-height:88px;
   width: 100%;
   position: fixed;
   bottom: 0;

+ 0 - 0
src/web/templates/dataMarket/customExport/Index.html → src/web/templates/dataMarket/customExport/index.html


+ 23 - 16
src/web/templates/dataMarket/dataInterface/index.html

@@ -92,7 +92,7 @@
     </section>
   </section>
   {{range $k,$v:=Ad "jy-pc-dataInterface-bottom" -1 .Host}}
-  <div class="data-market-ad-bottom">
+  <div class="data-market-ad-bottom" onClick="isAdJump({{ $v }})">
     <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
   </div>
   {{end}}
@@ -160,23 +160,30 @@
     });
   };
   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 });
+    var top1 = 0;
+    var top2 = 0;
+    var timer = null; // 定时器
+    $(document).scroll(function(){
+      clearTimeout(timer)
+      timer = setTimeout(isScrollEnd, 1000);
+      top1 = document.documentElement.scrollTop || document.body.scrollTop;
+      // console.log("滚动中")
+      $('.data-market-ad-bottom').fadeOut()
+    })
+    function isScrollEnd() {
+      top2 = document.documentElement.scrollTop || document.body.scrollTop;
+      if(top1 == top2 && (window.memberStatus <= 0 || !window.memberStatus)){
+        // console.log('滚动结束了')
+        $('.data-market-ad-bottom').fadeIn()
+      }
     }
   };
+  // 广告位跳转链接
+  function isAdJump(item){
+    if(item.s_link){
+      window.open(item.s_link)
+    }
+  }
 </script>
 </body>
 </html>

+ 0 - 4
src/web/templates/site/page/jyblogdetail.html

@@ -118,10 +118,6 @@
         {{end}}
       </article>
       <aside>
-        <script script type="text/javascript">
-          var pCode ={{.T.pCode}}
-          alert(pCode)
-        </script>
         {{include "/site/common/slide-leave-info.html"}}
         <div class="real_time_info_module" style="margin-top:40px;">
           <div class="module_title">