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

@@ -8,7 +8,8 @@ var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload'),
     Hammer = require('yoho.hammer');
 
-var chosePanel = require('./chose-panel');
+var chosePanel = require('./chose-panel'),
+    tip = require('../plugin/tip');
 
 var $cartContent = $('.cart-content');
 
@@ -46,7 +47,11 @@ if ($('.cart-nav').length > 0) {
 }
 
 $('.btn-balance').on('touchend', function() {
-    window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
+     if($('.balance span').hasClass('icon-cb-checked')){
+         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
+     } else {
+         tip.show('请先勾选商品~');
+     }
 });
 
 $('.chose').on('touchend', function() {

@@ -52,7 +52,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
         this.selected = properties.selected;
     }
 
-    goodInfo.goods_type = getCartType();
+    goodInfo.goods_type = cartType;
     goodInfo.selected = isSelected ? 'N' : 'Y';
     goodInfo.product_sku = id;
     goodInfo.buy_number = $good.find('.count').eq(0).text().trim().replace('×', '');