From 11c1f93e569974e64903b34a55a19740e0ce7b4a Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 4 Jan 2022 18:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=94=AE=E5=90=8E=E6=98=BE=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/AfterSaleController.php | 12 +++++++-----
 app/Admin/Controllers/UserController.php      |  3 +++
 resources/lang/zh_CN/after-sale.php           |  6 ++++++
 resources/lang/zh_CN/user.php                 |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/AfterSaleController.php b/app/Admin/Controllers/AfterSaleController.php
index d5cd0499..3e64212b 100644
--- a/app/Admin/Controllers/AfterSaleController.php
+++ b/app/Admin/Controllers/AfterSaleController.php
@@ -31,7 +31,7 @@ class AfterSaleController extends AdminController
      */
     protected function grid()
     {
-        $builder = AfterSale::with(['user', 'order', 'orderProduct', 'tags']);
+        $builder = AfterSale::with(['user', 'user.userInfo', 'order', 'orderProduct', 'tags']);
 
         return Grid::make($builder, function (Grid $grid) {
             $orderProductId = Request::query('order_product_id', 0);
@@ -48,6 +48,7 @@ class AfterSaleController extends AdminController
                 return $array;
             })->label();
             $grid->column('user.phone')->copyable();
+            $grid->column('user.userInfo.nickname');
             $grid->column('order.sn')->if(function () {
                 return Admin::user()->can('dcat.admin.orders.show');
             })
@@ -123,16 +124,14 @@ class AfterSaleController extends AdminController
     {
         return function (Row $row) use ($id) {
             $row->column(4, function ($column) use ($id) {
-                $builder = AfterSale::with(['user', 'order', 'orderProduct', 'tags']);
+                $builder = AfterSale::with(['user', 'user.userInfo', 'order', 'orderProduct', 'tags']);
                 $column->row(Show::make($id, $builder, function (Show $show) {
                     $show->field('id');
                     $show->field('sn');
                     $show->field('order.sn');
                     $show->field('user.phone');
+                    $show->field('user.user_info.nickname');
                     $show->field('order_product.name');
-                    $show->field('tags')->as(function () {
-                        return $this->tags->pluck('name');
-                    })->label();
                     $show->field('num');
                     if (in_array($show->model()->type, [AfterSaleModel::TYPE_REFUND_AND_RETURN, AfterSaleModel::TYPE_REFUND])) {
                         $show->field('amount')->as(function ($amount) {
@@ -157,6 +156,9 @@ class AfterSaleController extends AdminController
                         AfterSaleModel::STATE_FINISH=>'success',
                         AfterSaleModel::STATE_CANCEL=>'#b3b9bf',
                     ]);
+                    $show->field('tags')->as(function () {
+                        return $this->tags->pluck('name');
+                    })->label();
                     // $show->field('order_product.cover')->image();
                     $show->field('created_at');
                     $show->field('updated_at');
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index dfe48459..f875afcd 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -42,6 +42,8 @@ class UserController extends AdminController
         return Grid::make($builder, function (Grid $grid) {
             // $grid->column('id')->sortable();
             $grid->column('phone')->copyable();
+            $grid->column('userInfo.nickname');
+
             $grid->column('userInfo.agent_level')->display(function ($value) {
                 return $this->userInfo?->agent_level_name??'未知';
             })->label();
@@ -144,6 +146,7 @@ class UserController extends AdminController
                 $column->row(Show::make($id, $builder, function (Show $show) {
                     $show->field('id');
                     $show->field('phone');
+                    $show->field('user_info.nickname');
                     $show->field('user_info.agent_level')->as(function ($value) {
                         return $this->userInfo?->agent_level_name??'未知';
                     })->label();
diff --git a/resources/lang/zh_CN/after-sale.php b/resources/lang/zh_CN/after-sale.php
index 5b5fa775..2db2c443 100644
--- a/resources/lang/zh_CN/after-sale.php
+++ b/resources/lang/zh_CN/after-sale.php
@@ -9,6 +9,12 @@ return [
         'user_id' => '用户ID',
         'user'=>[
             'phone' => '手机号',
+            'userInfo' => [
+                'nickname' => '昵称',
+            ],
+            'user_info'=>[
+                'nickname' => '昵称',
+            ],
         ],
         'order_id' => '原订单ID',
         'order'=>[
diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php
index d9fd78ad..3fdc35bb 100644
--- a/resources/lang/zh_CN/user.php
+++ b/resources/lang/zh_CN/user.php
@@ -23,6 +23,7 @@ return [
         ],
         'userInfo'=>[
             'avatar' => '头像',
+            'nickname' => '昵称',
             'agent_level'=>'管理级别',
             'growth_value'=>'消费值',
             'group_sales_value'=>'业绩',
@@ -34,6 +35,7 @@ return [
         ],
         'user_info'=>[
             'avatar' => '头像',
+            'nickname' => '昵称',
             'agent_level'=>'管理级别',
             'growth_value'=>'消费值',
             'group_sales_value'=>'业绩',