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,5 +181,11 @@ $('.chose').on('touchend', function() {
     chosePanel.show();
     chosePanel.show();
 });
 });
 
 
+$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);

@@ -31,6 +31,7 @@
     }
     }
 
 
     .basic-info {
     .basic-info {
+        // height: 100rem / $pxConvertRem;
         overflow: hidden;
         overflow: hidden;
         position: relative;
         position: relative;
         margin-bottom: pxToRem(30px);
         margin-bottom: pxToRem(30px);
@@ -155,10 +156,12 @@
         height: 80rem / $pxConvertRem;
         height: 80rem / $pxConvertRem;
         line-height: 80rem / $pxConvertRem;
         line-height: 80rem / $pxConvertRem;
         padding: 0;
         padding: 0;
-        border: none;
-        border-top: 1px solid #e6e6e6;
-        border-bottom: 1px solid #e6e6e6;
+        border: 1px solid #e6e6e6;
         text-align: center;
         text-align: center;
+        margin-left: -1px;
+    }
+    .btn-plus{
+        margin-left: -1px;
     }
     }
 
 
     .btn-wrap {
     .btn-wrap {

@@ -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);

@@ -684,7 +684,7 @@ class CartModel
                 // 缩略图
                 // 缩略图
                 foreach ($val['images_list'] as $image) {
                 foreach ($val['images_list'] as $image) {
                     $thumbImageList[] = array(
                     $thumbImageList[] = array(
-                        'img' => Helpers::getImageUrl($image['image_url'], 80, 106)
+                        'img' => Helpers::getImageUrl($image['image_url'], 60, 60)
                     );
                     );
                 }
                 }