Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy

@@ -180,16 +180,5 @@ $('.chose').on('touchend', function() {
     chosePanel.show();
     chosePanel.show();
 });
 });
 
 
-function notAllowScroll() {
-    var docH = $(document).height(),
-        winH = $(window).height();
-
-    if (docH - winH <= 10) {
-        $('body').css('overflow', 'hidden');
-    }
-}
-
-notAllowScroll();
-
 //提前触发lazyload
 //提前触发lazyload
 $(window).scrollTop(1).scrollTop(0);
 $(window).scrollTop(1).scrollTop(0);

@@ -15,6 +15,11 @@
 
 
     .cart-content > * {
     .cart-content > * {
         background: #fff;
         background: #fff;
+
+        &:first-child {
+            border-top: none;
+            margin-top: 0;
+        }
     }
     }
 
 
     .cart-nav {
     .cart-nav {

@@ -16,7 +16,7 @@
         padding: pxToRem(30px) 0 pxToRem(20px);
         padding: pxToRem(30px) 0 pxToRem(20px);
         width: 100%;
         width: 100%;
         height: pxToRem(252px);
         height: pxToRem(252px);
-        overflow: hidden;
+        // overflow: hidden;
 
 
         .swiper-slide {
         .swiper-slide {
             padding: 0 pxToRem(10px);
             padding: 0 pxToRem(10px);

-<div class="cart-goods">
-    {{# goods}}
-        {{> cart/good}}
-    {{/ goods}}
-</div>
+{{#if goods}}
+    <div class="cart-goods">
+        {{# goods}}
+            {{> cart/good}}
+        {{/ goods}}
+    </div>
+{{/if}}
 
 
 {{#if notValidGoods}}
 {{#if notValidGoods}}
     <div class="invalid-goods">
     <div class="invalid-goods">