Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuywap-node into release/6.1

@@ -30,5 +30,7 @@
             <span class="iconfont">&#xe639;</span>
         </div>
     </div>
-    <div class="reload"><span class="iconfont">&#xe733;</span>点击刷新二维码</div>
+    <div class="reload-c">
+        <div class="reload"><span class="iconfont">&#xe733;</span>点击刷新二维码</div>
+    </div>
 </div>
\ No newline at end of file

@@ -384,7 +384,10 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
-    if (self.find('span').data('message') && delivery === 0) {
+    // 点击货到付款弹出提示语
+    if (self.find('span').data('message') && delivery === 0 &&
+        parseInt(self.find('i').data('payment-type'), 10) === 2) {
+
         dialog.showDialog({
             hasHeader: '温馨提示',
             dialogText: self.find('span').data('message'),

@@ -35,7 +35,8 @@ let $invoice = $('.invoice'),
     isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
     addressTop = $('.address-wrap').outerHeight(),
     $message = $('#msg'),
-    $noPrintPrice = $('.no-print-price');
+    $noPrintPrice = $('.no-print-price'),
+    delivery = 0;
 
 const orderEnsure = new OrderEnsure(order);
 
@@ -416,6 +417,21 @@ $subBlock.on('touchstart', 'li', function() {
     });
     let self = $(this);
 
+    // 点击货到付款弹出提示语
+    if (self.find('span').data('message') && delivery === 0 &&
+        parseInt(self.find('i').data('payment-type'), 10) === 2) {
+
+        dialog.showDialog({
+            hasHeader: '温馨提示',
+            dialogText: self.find('span').data('message'),
+            hasFooter: {
+                centerBtnText: '我知道了'
+            }
+        });
+
+        delivery = 1;
+    }
+
     setTimeout(function() {
         self.parents('ul').hide();
     }, 300);

@@ -16,7 +16,8 @@ class NewHome extends Page {
             $codeSet: $('.code-set'),
             $resYas: $('.res-c').find('a'),
             $trendCode: $('.trend-code'),
-            $floatTop: $('.float-top')
+            $floatTop: $('.float-top'),
+            $recommendC: $('#new-recommend-c')
         };
 
         this.init();
@@ -33,13 +34,17 @@ class NewHome extends Page {
     }
 
     backToTop() {
-        $(document).scroll(() => {
-            if (($(document).scrollTop() >= 120)) {
-                this.selector.$floatTop.addClass('hover');
-            } else {
-                this.selector.$floatTop.removeClass('hover');
-            }
-        });
+        if (this.selector.$recommendC.length > 0) {
+            $(document).scroll(() => {
+                let recommendTop = this.selector.$recommendC.offset().top - $(document).scrollTop();
+
+                if (recommendTop <= 400) {
+                    this.selector.$floatTop.addClass('hover');
+                } else {
+                    this.selector.$floatTop.removeClass('hover');
+                }
+            });
+        }
     }
 
     autoScroll() {

@@ -43,7 +43,7 @@ class NewRecommend extends Page {
                     this.selector.$goodsContainer.append($goodsData);
                     lazyLoad($goodsData.find('img.lazy'));
                 } else {
-                    this.selector.$recommendC.hide();
+                    this.selector.$recommendC.remove();
                 }
             }
         }).catch(error => {

@@ -2,7 +2,6 @@ body,
 html {
     background-image: linear-gradient(#131313, #3e3e3e);
     background-repeat: no-repeat;
-    min-height: 100%;
     background-color: #3e3e3e;
 }
 
@@ -163,23 +162,33 @@ html {
         }
     }
 
-    .reload {
+    .reload-c {
+        width: 750px;
+        height: 90px;
+        line-height: 90px;
+        background-color: #333;
         position: fixed;
-        bottom: 54px;
-        left: 50%;
-        font-size: 24px;
-        color: #b0b0b0;
-        width: 200px;
-        line-height: 30px;
-        margin-left: -100px;
-        text-align: center;
-
-        span {
-            font-size: 40px;
-            color: #eee;
+        bottom: 0;
+        left: 0;
+
+        .reload {
             position: absolute;
-            top: 0;
-            left: -30px;
+            bottom: 0;
+            left: 50%;
+            font-size: 24px;
+            color: #b0b0b0;
+            width: 200px;
+            line-height: 90px;
+            margin-left: -100px;
+            text-align: center;
+
+            span {
+                font-size: 40px;
+                color: #eee;
+                position: absolute;
+                top: 0;
+                left: -30px;
+            }
         }
     }
 }