From f9cb1c4370c79391fd68cb4e523b6ad3568ce96f Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Mon, 11 Oct 2021 10:59:01 +0800
Subject: [PATCH] name -> company_name

---
 app/Admin/Controllers/AgentProductController.php |  4 ++--
 app/Admin/Controllers/UserController.php         | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/AgentProductController.php b/app/Admin/Controllers/AgentProductController.php
index 5d32633..8523bef 100644
--- a/app/Admin/Controllers/AgentProductController.php
+++ b/app/Admin/Controllers/AgentProductController.php
@@ -20,7 +20,7 @@ class AgentProductController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new AgentProduct(['agent:id,name', 'guide:id,name']), function (Grid $grid) {
+        return Grid::make(new AgentProduct(['agent:id,company_name', 'guide:id,name']), function (Grid $grid) {
 			$grid->disableCreateButton();
 			$grid->disableRowSelector();
 			$grid->disableEditButton();
@@ -32,7 +32,7 @@ class AgentProductController extends AdminController
 			$grid->model()->where('type', 1);
 
             $grid->column('id')->sortable();
-            $grid->column('agent.name');
+            $grid->column('agent.company_name');
             $grid->column('title')->limit(15);
             $grid->column('picture')->image('', 60, 60);
             $grid->column('price');
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index fda6afc..4d78abd 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -18,13 +18,13 @@ class UserController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new User('agent:id,name'), function (Grid $grid) {
+        return Grid::make(new User('agent:id,company_name'), function (Grid $grid) {
 			$grid->disableRowSelector();
 			$grid->disableCreateButton();
 			$grid->disableActions();
 
             $grid->column('id')->sortable();
-            $grid->column('agent.name', '所属代理商');
+            $grid->column('agent.company_name', '所属代理商');
             $grid->column('avatar')->image('', 60, 60);
             $grid->column('mobile');
             $grid->column('nickname');
@@ -50,11 +50,11 @@ class UserController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make($id, new User(['agent:id,name']), function (Show $show) {
+        return Show::make($id, new User(['agent:id,company_name']), function (Show $show) {
 			$show->disableDeleteButton();
 
             $show->field('id');
-            $show->field('agent.name', '代理商');
+            $show->field('agent.company_name', '代理商');
             $show->field('avatar')->image('', 80, 80);
             $show->field('mobile');
             $show->field('nickname');
@@ -76,8 +76,10 @@ class UserController extends AdminController
 
             /*$form->display('id');
             $form->text('status');*/
+        })->saving(function (Form $form) {
+			return $form->response()->error('操作禁止');
         })->deleting(function (Form $form) {
-			return $form->response()->error('禁止删除');
+			return $form->response()->error('操作禁止');
 		});
     }
 }