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

@@ -28,8 +28,8 @@ var $chosePanel = $('#chose-panel'),
     $curSizeBlock,
     $curSizeBlock,
     $sizeRowList,
     $sizeRowList,
     cbFn,
     cbFn,
-    cartType,
     $allChoseItems,
     $allChoseItems,
+    queryString,
     $yohoPage = $('.yoho-page');
     $yohoPage = $('.yoho-page');
 
 
 //初始化购物车面板显示
 //初始化购物车面板显示
@@ -39,6 +39,7 @@ function init() {
     hasChooseColor = false;
     hasChooseColor = false;
     hasChooseSize = false;
     hasChooseSize = false;
     $curSizeBlock = null;
     $curSizeBlock = null;
+    queryString = $.queryString();
     $imgsThumb = $('.chose-panel').find('.thumb');
     $imgsThumb = $('.chose-panel').find('.thumb');
     $allChoseItems = $('.chose-items');
     $allChoseItems = $('.chose-items');
     $sizeRowList = $('.size-list ul');
     $sizeRowList = $('.size-list ul');
@@ -167,7 +168,7 @@ $yohoPage.on('touchstart', '.color-list .block', function(e) {
             $preSiblingBlock.removeClass('chosed');
             $preSiblingBlock.removeClass('chosed');
             curSizeBlock = $curSizeRow.children().get(scindex);
             curSizeBlock = $curSizeRow.children().get(scindex);
         }
         }
-        
+
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
         if (curSizeBlock) {
         if (curSizeBlock) {
             curGoodNum = $(curSizeBlock).data('num');
             curGoodNum = $(curSizeBlock).data('num');
@@ -324,7 +325,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
                 buyNumber: buyNumber,
                 buyNumber: buyNumber,
                 promotionId: promotionId,
                 promotionId: promotionId,
                 isEdit: isEdit,
                 isEdit: isEdit,
-                cartType: cartType
+                cartType: queryString.cartType
             }
             }
         }).done(function(res) {
         }).done(function(res) {
             loading.hideLoadingMask();
             loading.hideLoadingMask();

@@ -26,7 +26,7 @@ function getProductInfo(skn, promotionId) {
             return;
             return;
         }
         }
         chosePanel.show(html, function() {
         chosePanel.show(html, function() {
-            window.location.href = '/cart/index/orderEnsure?cartType=' + queryString.cartType;
+            window.location.href = '/cart/index/index?cartType=' + queryString.cartType;
         });
         });
     }, function() {
     }, function() {
         tip.show('网络错误');
         tip.show('网络错误');