diff --git a/app/AdminAgent/Controllers/OrderController.php b/app/AdminAgent/Controllers/OrderController.php index 7c502eb..8ba481f 100644 --- a/app/AdminAgent/Controllers/OrderController.php +++ b/app/AdminAgent/Controllers/OrderController.php @@ -41,18 +41,22 @@ class OrderController extends AdminController $grid->column('id')->sortable(); $grid->column('order_no')->limit(10); - $grid->column('custom', '客户信息') - ->display(function () { - return $this->name . ',' . $this->mobile; - }) - ->modal('客户信息', function ($modal) { - if (!$this->info) return ''; - $titles = [ - 'id_card' => '身份证号', - '' - ]; - return Table::make($this->info); - }); + $grid->column('info', '订单信息') + ->display('查看') + ->modal('订单信息', function ($modal) { + $info = $this->info ?? []; + $info = array_map(function($v) { + if (isset($v['value'], $v['type'])) { + if ($v['type'] == 'image') { + return ''; + } else { + return $v['value']; + } + } + return $v; + }, $info); + return Table::make([], $info); + })->xl(); $grid->column('product', '产品信息') ->display('查看') ->modal('购买产品信息', function ($modal) { diff --git a/app/AdminSupplier/Controllers/OrderController.php b/app/AdminSupplier/Controllers/OrderController.php index 6dd4da9..f4960e0 100644 --- a/app/AdminSupplier/Controllers/OrderController.php +++ b/app/AdminSupplier/Controllers/OrderController.php @@ -41,19 +41,24 @@ class OrderController extends AdminController $grid->column('id')->sortable(); $grid->column('agent.name', '代理商'); + $grid->column('order_no', '订单号')->limit(10); $grid->column('title')->limit(20); $grid->column('picture')->image('', 60, 60); - $grid->column('product', '订单信息') + $grid->column('info', '订单信息') ->display('查看') ->modal('订单信息', function ($modal) { - return Table::make(['订单号', '姓名', '手机号', '订单总价', '购买数量'], - [[ - $this->order_no, - $this->name, - $this->mobile, - $this->price, - $this->num, - ]]); + $info = $this->info ?? []; + $info = array_map(function($v) { + if (isset($v['value'], $v['type'])) { + if ($v['type'] == 'image') { + return ''; + } else { + return $v['value']; + } + } + return $v; + }, $info); + return Table::make([], $info); })->xl(); $grid->column('paid_money'); $grid->column('price');