...
|
...
|
@@ -602,6 +602,7 @@ class CartModel |
|
|
//传递相关参数
|
|
|
$param = array_merge(array('cartType' => $cartType, 'skuList' => $skuList), $jitInfo);
|
|
|
$result['jitDetailUrl'] = Helpers::url('/cart/index/jitDetail', $param);
|
|
|
$result['packageTitle'] = $payReturn['shopping_cart_data']['package_title'];
|
|
|
}
|
|
|
$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'];
|
...
|
...
|
@@ -1189,8 +1190,8 @@ class CartModel |
|
|
}
|
|
|
// 拆单数据
|
|
|
foreach ($packageList as $pk => $pv) {
|
|
|
$result['packages'][$pk]['packageType'] = $pk + 1;
|
|
|
$result['packages'][$pk]['dispatchType'] = ($pv['supplier_id'] == 0) ? '总仓发货' : '异地调拨'; //仓库
|
|
|
$result['packages'][$pk]['packageType'] = '包裹' . ($pk + 1) . ':' . $pv['title'];
|
|
|
// $result['packages'][$pk]['dispatchType'] = $pv['title'];
|
|
|
$goodList = $pv['goods_list'];
|
|
|
foreach ($goodList as $glk => $glv) {
|
|
|
$result['packages'][$pk]['goods'][$glk]['thumb'] = Images::getImageUrl($glv['goods_images'], 235, 314);
|
...
|
...
|
|