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

@@ -14,6 +14,7 @@ var chosePanel = require('./chose-panel'),
 
 
 var $cartContent = $('.cart-content'),
 var $cartContent = $('.cart-content'),
     cartType = $('#cartType').val(),
     cartType = $('#cartType').val(),
+    $cartNav = $('.cart-nav'),
     hasShowCartPresellTip = false;
     hasShowCartPresellTip = false;
 
 
 var navHammer,
 var navHammer,
@@ -105,7 +106,7 @@ if ('advance' === cartType) {
     $(window).trigger('scroll');
     $(window).trigger('scroll');
 }
 }
 
 
-if ($('.cart-nav').length > 0) {
+if ($cartNav.length > 0) {
     navHammer = new Hammer(document.getElementsByClassName('cart-nav')[0]);
     navHammer = new Hammer(document.getElementsByClassName('cart-nav')[0]);
     navHammer.on('tap', function(e) {
     navHammer.on('tap', function(e) {
         var $this = $(e.target).closest('li');
         var $this = $(e.target).closest('li');
@@ -180,16 +181,11 @@ $('.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();
+$cartNav.on('touchstart', 'li', function(e) {
+    $(this).addClass('bytouch');
+}).on('touchend touchcancel', function() {
+    $cartNav.find('li').removeClass('bytouch');
+});
 
 
 //提前触发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">