Leadfyy.co
/
hainan
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

agent_name改为name；supplier_name改为name；account改为username

dev
李可松 5 years ago
parent
e14fac6f29
commit
c0be4891dd
6 changed files with 67 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      MySQL_change.sql
  2. 22
      app/Admin/Controllers/AgentController.php
  3. 14
      app/Admin/Controllers/GuideController.php
  4. 16
      app/Admin/Controllers/OrderController.php
  5. 22
      app/Admin/Controllers/SupplierController.php
  6. 4
      app/Admin/Controllers/UserController.php

29
MySQL_change.sql
View File

@ -76,7 +76,34 @@ COMMENT='地接'
COLLATE='utf8_general_ci'
ENGINE=InnoDB;
-----------------------------------
#################################################################
# 18:30 ‎2021/‎08/‎15
ALTER TABLE `agents`
CHANGE COLUMN `account` `username` VARCHAR(120) NOT NULL COMMENT '账号' COLLATE 'utf8_general_ci' AFTER `id`,
CHANGE COLUMN `password` `password` VARCHAR(80) NOT NULL COMMENT '密码' COLLATE 'utf8_general_ci' AFTER `username`,
CHANGE COLUMN `agent_name` `name` VARCHAR(255) NOT NULL COMMENT '代理商名称' COLLATE 'utf8_general_ci' AFTER `password`,
ADD COLUMN `avatar` VARCHAR(255) NULL DEFAULT NULL COMMENT '头像' COLLATE 'utf8_general_ci' AFTER `name`,
DROP INDEX `account`,
ADD UNIQUE INDEX `account` (`username`) USING BTREE;
ALTER TABLE `suppliers`
CHANGE COLUMN `account` `username` VARCHAR(120) NOT NULL COMMENT '账号' COLLATE 'utf8_general_ci' AFTER `id`,
CHANGE COLUMN `password` `password` VARCHAR(80) NOT NULL COMMENT '密码' COLLATE 'utf8_general_ci' AFTER `username`,
CHANGE COLUMN `supplier_name` `name` VARCHAR(50) NOT NULL COMMENT '供应商名称' COLLATE 'utf8_general_ci' AFTER `password`,
ADD COLUMN `avatar` VARCHAR(255) NULL DEFAULT NULL COMMENT '头像' COLLATE 'utf8_general_ci' AFTER `name`,
DROP INDEX `account`,
ADD UNIQUE INDEX `account` (`username`) USING BTREE;
ALTER TABLE `guides`
CHANGE COLUMN `account` `username` VARCHAR(120) NOT NULL COMMENT '账号' COLLATE 'utf8_general_ci' AFTER `id`,
CHANGE COLUMN `password` `password` VARCHAR(80) NOT NULL COMMENT '密码' COLLATE 'utf8_general_ci' AFTER `username`,
CHANGE COLUMN `guide_name` `name` VARCHAR(50) NOT NULL COMMENT '供应商名称' COLLATE 'utf8_general_ci' AFTER `password`,
ADD COLUMN `avatar` VARCHAR(255) NULL DEFAULT NULL COMMENT '头像' COLLATE 'utf8_general_ci' AFTER `name`,
DROP INDEX `account`,
ADD UNIQUE INDEX `account` (`username`) USING BTREE;

22
app/Admin/Controllers/AgentController.php
View File

@ -29,8 +29,8 @@ class AgentController extends AdminController
}
$grid->column('id')->sortable();
$grid->column('account');
$grid->column('agent_name');
$grid->column('username');
$grid->column('name');
$grid->column('company_name');
$grid->column('logo')->image(60, 60);
$grid->column('address');
@ -60,7 +60,7 @@ class AgentController extends AdminController
$filter->panel();
$filter->equal('id')->width(2);
$filter->like('agent_name')->width(3);
$filter->like('name')->width(3);
$filter->equal('status', '用户状态')->select(UserStatus::array())->width(2);
});
});
@ -79,9 +79,9 @@ class AgentController extends AdminController
$show->disableDeleteButton();
$show->field('id');
$show->field('account');
$show->field('username');
$show->field('password');
$show->field('agent_name');
$show->field('name');
$show->field('appid');
$show->field('appsecret');
$show->field('mchid');
@ -126,14 +126,14 @@ class AgentController extends AdminController
$form->display('id');
//新增
if ($form->isCreating()) {
$form->text('account')->required();
$form->text('username')->required();
$form->text('password')->required();
}
else if ($form->isEditing()) {
$form->display('account');
$form->display('username');
$form->text('password')->customFormat(fn() => '');
}
$form->text('agent_name')->required();
$form->text('name')->required();
$form->text('appid')->required();
$form->text('appsecret')->required();
$form->text('mchid')->required();
@ -154,14 +154,14 @@ class AgentController extends AdminController
})->saving(function (Form $form) {
//判断账号是否唯一
if ($form->isCreating()) {
if ($form->repository()->model()->where('account', $form->account)->exists()) {
return $form->response()->error($form->account . ' 的账号已经存在');
if ($form->repository()->model()->where('username', $form->username)->exists()) {
return $form->response()->error($form->username . ' 的账号已经存在');
}
}
//不允许编辑的字段
if ($form->isEditing()) {
$form->ignore(['id', 'account', 'created_at', 'updated_at', 'deleted_at']);
$form->ignore(['id', 'username', 'created_at', 'updated_at', 'deleted_at']);
}
//过滤null字段

14
app/Admin/Controllers/GuideController.php
View File

@ -28,7 +28,7 @@ class GuideController extends AdminController
$grid->model()->where('status', UserStatus::UNAUDITED);
}
$grid->column('id')->sortable();
$grid->column('account');
$grid->column('username');
$grid->column('guide_name');
$grid->column('photo')->image(60, 60);
$grid->column('license_pic')->image(60, 60);
@ -75,7 +75,7 @@ class GuideController extends AdminController
$show->disableDeleteButton();
$show->field('id');
$show->field('account');
$show->field('username');
$show->field('guide_name');
$show->field('status')->using(UserStatus::array());
$show->field('photo')->image();
@ -99,12 +99,12 @@ class GuideController extends AdminController
$form->display('id');
//新增
if ($form->isCreating()) {
$form->text('account')->required();
$form->text('username')->required();
$form->text('password')->required();
}
//编辑
else if ($form->isEditing()) {
$form->display('account');
$form->display('username');
$form->text('password')->customFormat(fn() => '');
}
$form->select('status')->options(UserStatus::array())->default(UserStatus::NORMAL);
@ -115,14 +115,14 @@ class GuideController extends AdminController
})->saving(function (Form $form) {
//判断账号是否唯一
if ($form->isCreating()) {
if ($form->repository()->model()->where('account', $form->account)->exists()) {
return $form->response()->error($form->account . ' 的账号已经存在');
if ($form->repository()->model()->where('username', $form->username)->exists()) {
return $form->response()->error($form->username . ' 的账号已经存在');
}
}
//不允许编辑的字段
if ($form->isEditing()) {
$form->ignore(['id', 'account', 'created_at', 'updated_at', 'deleted_at']);
$form->ignore(['id', 'username', 'created_at', 'updated_at', 'deleted_at']);
}
//过滤null字段

16
app/Admin/Controllers/OrderController.php
View File

@ -22,16 +22,16 @@ class OrderController extends AdminController
protected function grid()
{
return Grid::make(new Order([
'agent:id,agent_name',
'agent:id,name',
'agentProduct.product:id,title,price,pictures',
'product.supplier:id,supplier_name'
'product.supplier:id,name'
]), function (Grid $grid) {
$grid->disableCreateButton();
$grid->disableDeleteButton();
$grid->column('id')->sortable();
$grid->column('order_no');
$grid->column('agent.agent_name');
$grid->column('agent.name');
$grid->column('mobile');
$grid->column('name');
$grid->column('product', '产品信息')
@ -47,8 +47,8 @@ class OrderController extends AdminController
$this->title,
'<img data-action="preview-img" src="'.$this->picture.'" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">',
$this->num,
$this->agent->agent_name,
$this->product->supplier->supplier_name,
$this->agent->name,
$this->product->supplier->name,
]]);
})->xl();
$grid->column('paid_money');
@ -70,10 +70,10 @@ class OrderController extends AdminController
$filter->equal('order_no')->width(3);
$filter->equal('status')->select(OrderStatus::array())->width(2);
$option = Agent::query()->pluck('agent_name', 'id');
$option = Agent::query()->pluck('name', 'id');
$filter->equal('agent_id', '代理商')->select($option)->width(3);
$option = Supplier::query()->pluck('supplier_name', 'id');
$option = Supplier::query()->pluck('name', 'id');
$filter->equal('product.supplier_id', '供应商')->select($option)->width(3);
$filter->between('created_at')->width(4);
@ -95,7 +95,7 @@ class OrderController extends AdminController
$show->disableQuickEdit();
$show->field('id');
$show->field('agent.agent_name');
$show->field('agent.name');
$show->field('mobile');
$show->field('name');
$show->field('num');

22
app/Admin/Controllers/SupplierController.php
View File

@ -29,8 +29,8 @@ class SupplierController extends AdminController
}
$grid->column('id')->sortable();
$grid->column('account');
$grid->column('supplier_name');
$grid->column('username');
$grid->column('name');
$grid->column('company_name');
$grid->column('logo')->image(60, 60);
$grid->column('address');
@ -60,7 +60,7 @@ class SupplierController extends AdminController
$filter->panel();
$filter->equal('id')->width(2);
$filter->like('supplier_name')->width(3);
$filter->like('name')->width(3);
$filter->equal('status', '用户状态')->select(UserStatus::array())->width(2);
});
});
@ -79,8 +79,8 @@ class SupplierController extends AdminController
$show->disableDeleteButton();
$show->field('id');
$show->field('account');
$show->field('supplier_name');
$show->field('username');
$show->field('name');
$show->field('company_name');
$show->field('logo')->image(60, 60);
$show->field('address');
@ -105,14 +105,14 @@ class SupplierController extends AdminController
$form->display('id');
//账号只允许新增，不允许编辑
if ($form->isCreating()) {
$form->text('account')->required();
$form->text('username')->required();
$form->text('password')->required();
}
else if ($form->isEditing()) {
$form->display('account');
$form->display('username');
$form->text('password')->customFormat(fn() => '');
}
$form->text('supplier_name')->required();
$form->text('name')->required();
$form->select('status', '状态')
->options(UserStatus::array())
->default(UserStatus::NORMAL)
@ -126,14 +126,14 @@ class SupplierController extends AdminController
})->saving(function (Form $form) {
//判断账号是否唯一
if ($form->isCreating()) {
if ($form->repository()->model()->where('account', $form->account)->exists()) {
return $form->response()->error($form->account . ' 的账号已经存在');
if ($form->repository()->model()->where('username', $form->username)->exists()) {
return $form->response()->error($form->username . ' 的账号已经存在');
}
}
//不允许编辑的字段
if ($form->isEditing()) {
$form->ignore(['id', 'account', 'created_at', 'created_at', 'deleted_at', 'deleted_at']);
$form->ignore(['id', 'username', 'created_at', 'created_at', 'deleted_at', 'deleted_at']);
}
//过滤null字段

4
app/Admin/Controllers/UserController.php
View File

@ -17,13 +17,13 @@ class UserController extends AdminController
*/
protected function grid()
{
return Grid::make(new User('agent:id,agent_name'), function (Grid $grid) {
return Grid::make(new User('agent:id,name'), function (Grid $grid) {
$grid->disableRowSelector();
$grid->disableCreateButton();
$grid->disableActions();
$grid->column('id')->sortable();
$grid->column('agent.agent_name', '代理商账号');
$grid->column('agent.name', '代理商账号');
$grid->column('avatar')->image(60, 60);
$grid->column('mobile');
$grid->column('nickname');

Write Preview
Loading…
Cancel
Save