...
|
...
|
@@ -526,9 +526,6 @@ class CartModel |
|
|
$result['isJit'] = true;
|
|
|
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
|
|
|
}
|
|
|
//测试
|
|
|
// $result['isJit'] = true;
|
|
|
// $result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', array('cartType' => $cartType, 'skuList' => $skuList));
|
|
|
$result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
|
|
|
$price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
|
|
|
$result['price'] = Helpers::transPrice($price, true);
|
...
|
...
|
|