Merge remote-tracking branch 'refs/remotes/origin/feature/magazine' into develop

@@ -14,7 +14,7 @@
     <div class="magazine-buy-num">
     <div class="magazine-buy-num">
         <div class="buy-num-title">
         <div class="buy-num-title">
             <div>请选择购买数量</div>
             <div>请选择购买数量</div>
-            <a href="#">
+            <a href="javascript:;" class="view-buy-tip">
                 查看购买说明
                 查看购买说明
                 <i class="iconfont">&#xe614;</i>
                 <i class="iconfont">&#xe614;</i>
             </a>
             </a>

@@ -2,6 +2,7 @@ require('scss/cart/magazine-confirm.page.scss');
 
 
 const $ = require('yoho-jquery');
 const $ = require('yoho-jquery');
 const toast = require('js/plugin/tip');
 const toast = require('js/plugin/tip');
+const dialog = require('js/plugin/dialog');
 
 
 let $activeItem = $('.choose-list .active');
 let $activeItem = $('.choose-list .active');
 let $totalPrice = $('.total-price .total-num');
 let $totalPrice = $('.total-price .total-num');
@@ -88,6 +89,19 @@ $('.buy-btn-wrap').on('click', 'button', function() {
     });
     });
 });
 });
 
 
+$('.view-buy-tip').on('click', function() {
+    dialog.showDialog({
+        hasClass: 'magazine-buytip-dialog',
+        hasHeader: '购买须知',
+        dialogText: '<ul><li>购买成功后，需要兑换阅读码阅读；</li>' +
+        '<li>电子刊为虚拟商品，若无系统问题，购买成功后不支持退换；</li>' +
+        '<li>购买多个电子刊阅读码，可以在【我的阅读码-阅读码】中赠送给好友兑换阅读；</li>' +
+        '<li>若出现无法阅读的情况，可以联系客服反馈问题，情况核对属实，将为您补发；</li></ul>',
+        hasFooter: {
+            centerBtnText: '知道了'
+        }
+    });
+});
 
 
 if ($activeItem.length) {
 if ($activeItem.length) {
     buyNumber = $activeItem.data().number || 1;
     buyNumber = $activeItem.data().number || 1;

@@ -63,14 +63,10 @@ function DragableElm(elm) {
 
 
     let bscroll = new BScroll(elm.find('.detail-container')[0]);
     let bscroll = new BScroll(elm.find('.detail-container')[0]);
 
 
-
     bscroll.on('scrollEnd', pos => {
     bscroll.on('scrollEnd', pos => {
-        console.log('scrollEnd', pos);
         _canDrag = _open ? pos.y > -10 : true;
         _canDrag = _open ? pos.y > -10 : true;
     });
     });
 
 
-    window.bscroll = bscroll;
-
     elm.on('touchstart', e => {
     elm.on('touchstart', e => {
         if (!_canDrag && open) {
         if (!_canDrag && open) {
             return;
             return;

@@ -18,6 +18,19 @@ body {
     }
     }
 }
 }
 
 
+.magazine-buytip-dialog {
+    .dialog-content {
+        padding-top: 0;
+        text-align: left;
+        font-size: 26px;
+
+        ul {
+            list-style: decimal;
+            padding-left: 30px;
+        }
+    }
+}
+
 .magazine-confirm-page {
 .magazine-confirm-page {
     padding-bottom: 150px;
     padding-bottom: 150px;
 }
 }

@@ -16,8 +16,8 @@ body {
 }
 }
 
 
 .top-downloadbar {
 .top-downloadbar {
-    position: absolute;
-    z-index: 2;
+    position: absolute !important;
+    z-index: 30;
 }
 }
 
 
 .magazine-cover-container {
 .magazine-cover-container {
@@ -38,6 +38,7 @@ body {
         position: relative;
         position: relative;
         box-sizing: border-box;
         box-sizing: border-box;
         padding-bottom: 134px;
         padding-bottom: 134px;
+        overflow: hidden;
 
 
         .filter-bg {
         .filter-bg {
             filter: blur(20px);
             filter: blur(20px);