From 63d821f93388fbb607a3451f043b198817dd67bc Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Thu, 30 Sep 2021 20:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/OrderController.php    | 14 +++++++++-----
 app/AdminSupplier/Controllers/OrderController.php | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

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 '<img data-action="preview-img" src="'.$v['value'].'" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
+								if (is_array($v['value'])) {
+									return array_reduce($v['value'], fn($v2, $v3) => $v2 . '<img data-action="preview-img" src="' . $v3 . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail"> &nbsp;');
+								} else {
+									return '<img data-action="preview-img" src="' . $v['value'] . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
+								}
 							} 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 '<img data-action="preview-img" src="'.$v['value'].'" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
+								if (is_array($v['value'])) {
+									return array_reduce($v['value'], fn($v2, $v3) => $v2 . '<img data-action="preview-img" src="' . $v3 . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail"> &nbsp;');
+								} else {
+									return '<img data-action="preview-img" src="' . $v['value'] . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
+								}
 							} 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');