|
|
@@ -117,7 +117,6 @@ class OrderService extends BaseService
|
|
|
foreach ($list['data'] as &$item) {
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
$item['pay_time'] = $item['pay_time'] ? datetime($item['pay_time'], 'Y-m-d H:i:s') : '';
|
|
|
- $item['supply_name'] = isset($supplyList[$item['supply_type']]) ? $supplyList[$item['supply_type']] : '';
|
|
|
$status = isset($item['status'])? $item['status'] : 0;
|
|
|
$item['status_text'] = '待付款';
|
|
|
$item['refund_status_text'] = '';
|
|
|
@@ -136,6 +135,7 @@ class OrderService extends BaseService
|
|
|
$goods = isset($item['goods'])? $item['goods'] : [];
|
|
|
if($goods){
|
|
|
foreach ($goods as &$v){
|
|
|
+ $v['supply_name'] = isset($supplyList[$v['supply_type']]) ? $supplyList[$v['supply_type']] : '';
|
|
|
$v['main_img'] = isset($v['main_img']) && $v['main_img']? get_image_url($v['main_img']) : '';
|
|
|
$v['sku_attr'] = isset($v['sku_attr']) && $v['sku_attr']? json_decode($v['sku_attr'], true) : [];
|
|
|
}
|
