diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index b2eb58d..17b276c 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -45,16 +45,20 @@ class OrderController extends AdminController ->display('查看') ->modal('订单信息', function ($modal) { $info = $this->info ?? []; - /*$info = array_map(function($v) { + $info = array_map(function($v) { if (isset($v['value'], $v['type'])) { if ($v['type'] == 'image') { - return ''; + if (is_array($v['value'])) { + return array_reduce($v['value'], fn($v2, $v3) => $v2 . '  '); + } else { + return ''; + } } else { - return $v['value']; + return is_string($v['value']) ? $v['value'] : join(',', $v['value']); } } - return $v; - }, $info);*/ + return is_string($v) ? $v : json_encode($v); + }, $info); return Table::make([], $info); })->xl(); $grid->column('product', '产品信息') diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php index 68bbb1b..6094be8 100644 --- a/app/AdminSupplier/Controllers/OrderController.php +++ b/app/AdminSupplier/Controllers/OrderController.php @@ -48,16 +48,20 @@ class OrderController extends AdminController ->display('查看') ->modal('订单信息', function ($modal) { $info = $this->info ?? []; - /*$info = array_map(function($v) { + $info = array_map(function($v) { if (isset($v['value'], $v['type'])) { if ($v['type'] == 'image') { - return ''; + if (is_array($v['value'])) { + return array_reduce($v['value'], fn($v2, $v3) => $v2 . '  '); + } else { + return ''; + } } else { - return $v['value']; + return is_string($v['value']) ? $v['value'] : join(',', $v['value']); } } - return $v; - }, $info);*/ + return is_string($v) ? $v : json_encode($v); + }, $info); return Table::make([], $info); })->xl(); $grid->column('paid_money');