修复结算时url参数传递的cartType与cokie中的cartType冲突的bug

@@ -276,10 +276,10 @@ class IndexController extends AbstractAction
         $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
         $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
 
 
         // 购物车商品为空跳转到购物车页面
         // 购物车商品为空跳转到购物车页面
-        $cartType = $this->get('cartType', 'ordinary');
+        $cartType = $this->get('cartType', '');
         $cookieData = $this->getCookie('order-info', null);
         $cookieData = $this->getCookie('order-info', null);
         $orderInfo = array();
         $orderInfo = array();
-        if (!empty($cookieData)) {
+        if (empty($cartType) && !empty($cookieData)) {
             $orderInfo = json_decode($cookieData, true);
             $orderInfo = json_decode($cookieData, true);
             $cartType = $orderInfo['cartType'];
             $cartType = $orderInfo['cartType'];
         }
         }