|
@@ -182,6 +182,16 @@ class Shop extends BaseController
|
|
|
->where('oid', $data['id'])
|
|
->where('oid', $data['id'])
|
|
|
->select()
|
|
->select()
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
+ // 解析 cart_info JSON 字段并合并到外层
|
|
|
|
|
+ foreach ($cartInfo as &$item) {
|
|
|
|
|
+ if (!empty($item['cart_info'])) {
|
|
|
|
|
+ $innerCartInfo = json_decode($item['cart_info'], true);
|
|
|
|
|
+ unset($item['cart_info']);
|
|
|
|
|
+ $item = array_merge($item, $innerCartInfo);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ unset($item['cart_info']);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
$data['cart_info'] = $cartInfo;
|
|
$data['cart_info'] = $cartInfo;
|
|
|
|
|
|
|
|
return app('json')->success($data);
|
|
return app('json')->success($data);
|
