Authored by 梁志锋

Merge remote-tracking branch 'origin/master'

... ... @@ -302,12 +302,13 @@ class IndexController extends AbstractAction
// 返回地址
$returnUrl = Helpers::url('/cart/index/index');
$cartType = $this->get('cartType', '');
$cartType = $this->get('cartType', 'ordinary');
$cookieData = $this->getCookie('order-info', null);
$orderInfo = array();
if (!empty($cookieData)) {
$orderInfo = json_decode($cookieData, true);
$cartType = $orderInfo['cartType'];
//如果为空,获取默认
$cartType = empty($orderInfo['cartType']) ? $cartType : $orderInfo['cartType'];
}
// 如果传递了code, sku,skn,buy_number就代表是限购商品
... ...