|
@@ -227,10 +227,14 @@ class Shop extends BaseController
|
|
|
->select()
|
|
->select()
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
|
|
|
- // 解析 cart_info JSON 字段为数组
|
|
|
|
|
|
|
+ // 解析 cart_info JSON 字段并合并到外层
|
|
|
foreach ($cartInfo as &$item) {
|
|
foreach ($cartInfo as &$item) {
|
|
|
if (!empty($item['cart_info'])) {
|
|
if (!empty($item['cart_info'])) {
|
|
|
- $item['cart_info'] = json_decode($item['cart_info'], true);
|
|
|
|
|
|
|
+ $innerCartInfo = json_decode($item['cart_info'], true);
|
|
|
|
|
+ unset($item['cart_info']);
|
|
|
|
|
+ $item = array_merge($item, $innerCartInfo);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ unset($item['cart_info']);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
