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

@@ -106,7 +106,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
                 });
                 });
                 orderInfo('couponCode', null);
                 orderInfo('couponCode', null);
                 orderInfo('couponName', null);
                 orderInfo('couponName', null);
-                history.go(0);
+                window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
             } else {
             } else {
                 tip.show(data.message);
                 tip.show(data.message);
             }
             }

@@ -313,10 +313,10 @@ class CartModel
      *
      *
      * @param int $uid 用户ID
      * @param int $uid 用户ID
      * @param string $cartType 购物车类型，ordinary表示普通购物车
      * @param string $cartType 购物车类型，ordinary表示普通购物车
-     * @param null|string $cookieData cookie中记录的一些订单有关数据
+     * @param array $orderInfo cookie中记录的一些订单有关数据
      * @return array 接口返回的数据
      * @return array 接口返回的数据
      */
      */
-    public static function cartPay($uid, $cartType, $cookieData)
+    public static function cartPay($uid, $cartType, $orderInfo)
     {
     {
         $result = array();
         $result = array();
 
 
@@ -324,13 +324,11 @@ class CartModel
 
 
         if ($pay && isset($pay['code']) && $pay['code'] === 200) {
         if ($pay && isset($pay['code']) && $pay['code'] === 200) {
             $payReturn = $pay['data'];
             $payReturn = $pay['data'];
-            $orderInfo = array();
             $address = array();
             $address = array();
             $orderCompute = array();
             $orderCompute = array();
 
 
             // cookie保存的数据
             // cookie保存的数据
-            if (!empty($cookieData)) {
-                $orderInfo = json_decode($cookieData, true);
+            if (!empty($orderInfo)) {
                 $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentTypeId'], $orderInfo['couponCode'], $orderInfo['yohoCoin']);
                 $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentTypeId'], $orderInfo['couponCode'], $orderInfo['yohoCoin']);
             }
             }
 
 

@@ -277,6 +277,12 @@ class IndexController extends AbstractAction
 
 
         // 购物车商品为空跳转到购物车页面
         // 购物车商品为空跳转到购物车页面
         $cartType = $this->get('cartType', 'ordinary');
         $cartType = $this->get('cartType', 'ordinary');
+        $cookieData = $this->getCookie('order-info', null);
+        $orderInfo = array();
+        if (!empty($cookieData)) {
+            $orderInfo = json_decode($cookieData, true);
+            $cartType = $orderInfo['cartType'];
+        }
         $cartKey = 'commonCart';
         $cartKey = 'commonCart';
         if ($cartType === 'advance') {
         if ($cartType === 'advance') {
             $cartKey = 'preSellCart';
             $cartKey = 'preSellCart';
@@ -289,12 +295,10 @@ class IndexController extends AbstractAction
             $this->go(Helpers::url('/cart/index/index'));
             $this->go(Helpers::url('/cart/index/index'));
         }
         }
 
 
-        $cookieData = $this->getCookie('order-info', null);
-        $uid = $this->getUid(true);
         $data = array(
         $data = array(
             'orderEnsurePage' => true,
             'orderEnsurePage' => true,
             'isOrdinaryCart' => ($cartType !== 'advance'),
             'isOrdinaryCart' => ($cartType !== 'advance'),
-            'orderEnsure' => CartModel::cartPay($uid, $cartType, $cookieData)
+            'orderEnsure' => CartModel::cartPay($uid, $cartType, $orderInfo)
         );
         );
 
 
         $this->_view->display('order-ensure', $data);
         $this->_view->display('order-ensure', $data);