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

@@ -66,7 +66,7 @@ $('.freebie').on('touchend', function() {
 
 
 $('.btn-balance').on('touchend', function() {
 $('.btn-balance').on('touchend', function() {
     if ($('.low-stocks').length > 0) {
     if ($('.low-stocks').length > 0) {
-        tip.show('请先删除库存不足商品');
+        tip.show('库存不足无法结算');
         return false;
         return false;
     }
     }
 
 

@@ -310,7 +310,6 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
 
 
         promotionId,
         promotionId,
         isEdit = 0,
         isEdit = 0,
-        numInCart = $('.num-tag').html() - 0,
         num = parseInt($num.val(), 10);
         num = parseInt($num.val(), 10);
 
 
     //颜色尺码没有选择
     //颜色尺码没有选择
@@ -322,7 +321,6 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         return;
         return;
     }
     }
 
 
-
     //TODO status change
     //TODO status change
     if ($('#chose-btn-sure').html() === '已售罄') {
     if ($('#chose-btn-sure').html() === '已售罄') {
         return;
         return;
@@ -360,9 +358,15 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
                 cartType: queryString.cartType
                 cartType: queryString.cartType
             }
             }
         }).done(function(res) {
         }).done(function(res) {
+            var cartNum;
+
             loading.hideLoadingMask();
             loading.hideLoadingMask();
             if (res.code === 200) {
             if (res.code === 200) {
-                $('.num-tag').html(numInCart + buyNumber).removeClass('hide');
+                cartNum = res.data.goods_count;
+                if (cartNum > 99) {
+                    cartNum = '99+';
+                }
+                $('.num-tag').html(cartNum).removeClass('hide');
                 confirming = false;
                 confirming = false;
 
 
                 if (cbFn) {
                 if (cbFn) {

@@ -6,6 +6,7 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
+    Hammer = require('yoho.hammer'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     loading = require('../plugin/loading'),
     chosePanel = require('./chose-panel');
     chosePanel = require('./chose-panel');
@@ -35,10 +36,22 @@ function getProductInfo(skn, promotionId) {
     });
     });
 }
 }
 
 
-$page.on('touchend', '.chose', function() {
-    var $this = $(this),
-        id = $this.closest('.gift-advance-good').data('id'),
-        promotionId = $this.closest('.advance-block').data('promotion-id');
+$page.find('.chose').each(function(i, elem) {
+    var choseHammer = new Hammer(elem);
 
 
-    getProductInfo(id, promotionId);
+    choseHammer.on('tap', function(e) {
+        var $this = $(e.target),
+            id = $this.closest('.gift-advance-good').data('id'),
+            promotionId = $this.closest('.advance-block').data('promotion-id');
+
+        getProductInfo(id, promotionId);
+    });
 });
 });
+
+// $page.on('touchend', '.chose', function() {
+//     var $this = $(this),
+//         id = $this.closest('.gift-advance-good').data('id'),
+//         promotionId = $this.closest('.advance-block').data('promotion-id');
+//
+//     getProductInfo(id, promotionId);
+// });

@@ -27,6 +27,13 @@ $('.shopping-cart-good .name').each(function() {
     this.mlellipsis(2);
     this.mlellipsis(2);
 });
 });
 
 
+function GoodInfo(properties) {
+    this.goods_type = properties.goods_type;
+    this.buy_number = properties.buy_number;
+    this.product_sku = properties.product_sku;
+    this.selected = properties.selected;
+}
+
 //TIP:事件委托在.cart-goods，商品列表的容器统一需要有.cart-goods
 //TIP:事件委托在.cart-goods，商品列表的容器统一需要有.cart-goods
 $('.cart-goods').on('touchstart', '.checkbox', function() {
 $('.cart-goods').on('touchstart', '.checkbox', function() {
     var $this = $(this),
     var $this = $(this),
@@ -43,12 +50,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
         isSelected = false;
         isSelected = false;
     }
     }
 
 
-    function GoodInfo(properties) {
-        this.goods_type = properties.goods_type;
-        this.buy_number = properties.buy_number;
-        this.product_sku = properties.product_sku;
-        this.selected = properties.selected;
-    }
+
 
 
     goodInfo.goods_type = cartType;
     goodInfo.goods_type = cartType;
     goodInfo.selected = isSelected ? 'N' : 'Y';
     goodInfo.selected = isSelected ? 'N' : 'Y';
@@ -174,17 +176,10 @@ function didUpdateAllGoodsCheckStatus() {
 }
 }
 
 
 function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
 function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
-    var goodInfo = {};
-    var $goods = $('.cart-content:not(.hide) .shopping-cart-good');
-    var $good = null;
-    var goodsList = [];
-
-    function GoodInfo(properties) {
-        this.goods_type = properties.goods_type;
-        this.buy_number = properties.buy_number;
-        this.product_sku = properties.product_sku;
-        this.selected = properties.selected;
-    }
+    var goodInfo = {},
+        $goods = $('.cart-content:not(.hide) .shopping-cart-good'),
+        $good = null,
+        goodsList = [];
 
 
     goodInfo.goods_type = type;
     goodInfo.goods_type = type;
     goodInfo.selected = isSelected ? 'N' : 'Y';
     goodInfo.selected = isSelected ? 'N' : 'Y';

@@ -10,9 +10,6 @@
             {{#if price}}
             {{#if price}}
             <span class="price market-price">&yen;{{marketPrice}}</span>
             <span class="price market-price">&yen;{{marketPrice}}</span>
             {{/if}}
             {{/if}}
-            <span class="count">
-                ×{{count}}
-            </span>
         </p>
         </p>
         <button class="chose">选择</button>
         <button class="chose">选择</button>
     </div>
     </div>