diff --git a/app/Admin/Controllers/DealerOrderController.php b/app/Admin/Controllers/DealerOrderController.php index 3b51f592..e67706d4 100644 --- a/app/Admin/Controllers/DealerOrderController.php +++ b/app/Admin/Controllers/DealerOrderController.php @@ -26,7 +26,7 @@ class DealerOrderController extends AdminController */ protected function grid() { - $builder = DealerOrder::with(['user', 'consignor']); + $builder = DealerOrder::with(['user', 'userInfo', 'consignor']); return Grid::make($builder, function (Grid $grid) { $type = Request::input('type', ''); if ($type == 'manager') { @@ -38,6 +38,7 @@ class DealerOrderController extends AdminController $grid->column('id')->sortable(); $grid->column('sn'); $grid->column('user.phone')->copyable(); + $grid->column('userInfo.nickname'); $grid->column('consignor.phone')->display(function ($value) { return $value??'系统'; }); @@ -119,6 +120,11 @@ class DealerOrderController extends AdminController DealerOrderStatus::Completed->value => 'success', DealerOrderStatus::Cancelled->value => '#b3b9bf', ]); + $show->field('user.phone'); + $show->field('user_info.nickname'); + $show->field('consignor.phone')->as(function ($value) { + return $value??'系统'; + }); $show->field('pay_image')->image(); // $show->field('order_status') $show->divider(); diff --git a/resources/lang/zh_CN/dealer-order.php b/resources/lang/zh_CN/dealer-order.php index ed2605da..8bf5de78 100644 --- a/resources/lang/zh_CN/dealer-order.php +++ b/resources/lang/zh_CN/dealer-order.php @@ -12,6 +12,12 @@ return [ 'user'=>[ 'phone' => '下单用户', ], + 'userInfo' => [ + 'nickname' => '昵称', + ], + 'user_info'=>[ + 'nickname' => '昵称', + ], 'consignor_id' => '发货用户', 'consignor' => [ 'phone' => '发货用户',