From cd5f3b6b4f77a6062d8672d27a71c2c797649b25 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 24 Jan 2022 14:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=B9=E9=9B=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/DealerOrderController.php | 8 +++++++-
 resources/lang/zh_CN/dealer-order.php           | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

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' => '发货用户',