From ec3f8d8bec801e8cbbd5a90d4474eff0532cbd2c Mon Sep 17 00:00:00 2001 From: liapples Date: Mon, 11 Oct 2021 11:53:48 +0800 Subject: [PATCH] license_pic -> business_license --- MySQL_change.sql | 6 ++++++ app/Admin/Controllers/AgentController.php | 8 ++++---- app/Admin/Controllers/SupplierController.php | 6 +++--- app/AdminAgent/Controllers/SupplierController.php | 4 ++-- app/AdminAgent/Forms/AgentInfo.php | 6 +++--- app/AdminSettled/Controllers/AgentController.php | 2 +- app/AdminSettled/Controllers/SupplierController.php | 2 +- app/AdminSupplier/Controllers/AgentController.php | 4 ++-- app/AdminSupplier/Forms/SupplierInfo.php | 4 ++-- dcat_admin_ide_helper.php | 8 ++++---- ready.md | 4 ++-- resources/lang/zh_CN/agent.php | 2 +- resources/lang/zh_CN/supplier.php | 2 +- 13 files changed, 32 insertions(+), 26 deletions(-) diff --git a/MySQL_change.sql b/MySQL_change.sql index 0e1a2ab..03b1c2b 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -221,3 +221,9 @@ ALTER TABLE `products` ALTER TABLE `agent_products` CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL COMMENT '销售价' AFTER `product_ids`, CHANGE COLUMN `original_price` `original_price` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '市场价' AFTER `price`; + +# 11:52 2021/10/11 +ALTER TABLE `agents` + CHANGE COLUMN `license_pic` `business_license` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '营业执照' COLLATE 'utf8_general_ci' AFTER `address`; +ALTER TABLE `suppliers` + CHANGE COLUMN `license_pic` `business_license` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '营业执照' COLLATE 'utf8_general_ci' AFTER `address`; diff --git a/app/Admin/Controllers/AgentController.php b/app/Admin/Controllers/AgentController.php index 9067435..e732566 100644 --- a/app/Admin/Controllers/AgentController.php +++ b/app/Admin/Controllers/AgentController.php @@ -39,7 +39,7 @@ class AgentController extends AdminController $grid->column('company_name'); $grid->column('logo')->image('', 60, 60); $grid->column('address'); - $grid->column('license_pic')->image('', 60, 60); + $grid->column('business_license')->image('', 60, 60); $grid->column('director'); $grid->column('contact_phone'); //$grid->column('rate')->editable()->help('分成百分比，如10%，则输入10'); @@ -95,7 +95,7 @@ class AgentController extends AdminController $show->field('credit_codes'); $show->field('logo')->image('', 80, 80); $show->field('address'); - $show->field('license_pic')->image('', 80, 80); + $show->field('business_license')->image('', 80, 80); $show->field('director'); $show->field('contact_phone'); $show->field('legal_persona_name'); @@ -159,7 +159,7 @@ class AgentController extends AdminController $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); $form->image('logo')->removable(false)->uniqueName(); $form->text('address'); - $form->image('license_pic')->removable(false)->uniqueName(); + $form->image('business_license')->removable(false)->uniqueName(); $form->text('director'); $form->text('contact_phone'); $form->text('legal_persona_name')->required()->maxLength(20)->help('很重要，注册小程序时需要用到，用于实名认证'); @@ -221,7 +221,7 @@ class AgentController extends AdminController 'company_name' => $form->model()->company_name, 'logo' => $form->model()->logo, 'address' => $form->model()->address, - 'license_pic' => $form->model()->license_pic, + 'business_license' => $form->model()->business_license, 'director' => $form->model()->director, 'contact_phone' => $form->model()->contact_phone, //'rate' => $form->model()->password, diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index f8ab8c7..58795f3 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -39,7 +39,7 @@ class SupplierController extends AdminController $grid->column('company_name'); $grid->column('logo')->image('', 60, 60); $grid->column('address'); - $grid->column('license_pic')->image('', 60,60); + $grid->column('business_license')->image('', 60,60); $grid->column('director'); $grid->column('contact_phone'); //$grid->column('rate')->editable()->help('分成百分比，如10%，则输入10'); @@ -89,7 +89,7 @@ class SupplierController extends AdminController $show->field('company_name'); $show->field('logo')->image('', 60, 60); $show->field('address'); - $show->field('license_pic')->image('', 60, 60); + $show->field('business_license')->image('', 60, 60); $show->field('director'); $show->field('contact_phone'); //$show->field('rate'); @@ -137,7 +137,7 @@ class SupplierController extends AdminController $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); $form->image('logo')->removable(false)->uniqueName(); $form->text('address')->required(); - $form->image('license_pic')->removable(false)->uniqueName(); + $form->image('business_license')->removable(false)->uniqueName(); $form->text('director'); $form->mobile('contact_phone'); //$form->number('rate')->min(0)->max(100)->help('分成百分比，如10%，则输入10'); diff --git a/app/AdminAgent/Controllers/SupplierController.php b/app/AdminAgent/Controllers/SupplierController.php index 30d857a..f1ec72b 100644 --- a/app/AdminAgent/Controllers/SupplierController.php +++ b/app/AdminAgent/Controllers/SupplierController.php @@ -38,7 +38,7 @@ class SupplierController extends AdminController $grid->column('contact_phone'); $grid->column('logo')->image('', 60, 60); $grid->column('avatar')->image('', 60, 60); - $grid->column('license_pic')->image('', 60, 60); + $grid->column('business_license')->image('', 60, 60); $grid->column('created_at', '入驻时间'); $grid->filter(function (Grid\Filter $filter) { @@ -67,7 +67,7 @@ class SupplierController extends AdminController $show->field('contact_phone'); $show->field('logo'); $show->field('avatar'); - $show->field('license_pic'); + $show->field('business_license'); $show->field('created_at'); $show->field('updated_at');*/ }); diff --git a/app/AdminAgent/Forms/AgentInfo.php b/app/AdminAgent/Forms/AgentInfo.php index 5d8d62c..8372a71 100644 --- a/app/AdminAgent/Forms/AgentInfo.php +++ b/app/AdminAgent/Forms/AgentInfo.php @@ -30,7 +30,7 @@ class AgentInfo extends Form $model->contact_phone = $input['contact_phone']; $model->logo = $input['logo']; $model->avatar = $input['avatar']; - //$model->license_pic = $input['license_pic']; + //$model->business_license = $input['business_license']; //$model->legal_persona_name = $input['legal_persona_name']; $model->legal_persona_wechat = $input['legal_persona_wechat']; $model->status = UserStatus::UNAUDITED; @@ -50,7 +50,7 @@ class AgentInfo extends Form public function form() { Admin::translation('agent'); - + $this->select('type')->options(AgentType::array())->disable(); $this->text('name')->required(); @@ -64,7 +64,7 @@ class AgentInfo extends Form $this->text('contact_phone')->required(); $this->image('logo')->required(); $this->image('avatar'); - $this->image('license_pic')->required()->disable(); + $this->image('business_license')->required()->disable(); $this->text('legal_persona_name')->required()->disable(); $this->text('legal_persona_wechat')->required(); diff --git a/app/AdminSettled/Controllers/AgentController.php b/app/AdminSettled/Controllers/AgentController.php index 07bb0f1..e317bd5 100644 --- a/app/AdminSettled/Controllers/AgentController.php +++ b/app/AdminSettled/Controllers/AgentController.php @@ -74,7 +74,7 @@ class AgentController extends AdminController $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); $form->image('logo')->required()->removable(false)->uniqueName(); $form->text('address')->required(); - $form->image('license_pic')->required()->removable(false)->uniqueName(); + $form->image('business_license')->required()->removable(false)->uniqueName(); $form->text('director')->required(); $form->text('contact_phone')->required()->maxLength(13); $form->text('legal_persona_name')->required()->maxLength(20)->help('很重要，注册小程序时需要用到，用于实名认证'); diff --git a/app/AdminSettled/Controllers/SupplierController.php b/app/AdminSettled/Controllers/SupplierController.php index 99253a5..3015062 100644 --- a/app/AdminSettled/Controllers/SupplierController.php +++ b/app/AdminSettled/Controllers/SupplierController.php @@ -62,7 +62,7 @@ class SupplierController extends AdminController $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); $form->image('logo')->removable(false)->uniqueName(); $form->text('address')->required(); - $form->image('license_pic')->required()->removable(false)->uniqueName(); + $form->image('business_license')->required()->removable(false)->uniqueName(); $form->text('director')->required(); $form->text('contact_phone')->required()->maxLength(13); })->saving(function (Form $form) { diff --git a/app/AdminSupplier/Controllers/AgentController.php b/app/AdminSupplier/Controllers/AgentController.php index 8a53bc4..2afbfef 100644 --- a/app/AdminSupplier/Controllers/AgentController.php +++ b/app/AdminSupplier/Controllers/AgentController.php @@ -42,7 +42,7 @@ class AgentController extends AdminController $grid->column('director'); $grid->column('contact_phone'); $grid->column('logo')->image('', 60, 60); - $grid->column('license_pic')->image('', 60, 60); + $grid->column('business_license')->image('', 60, 60); $grid->column('status')->using(UserStatus::array()); $grid->column('created_at', '注册时间'); @@ -76,7 +76,7 @@ class AgentController extends AdminController $show->field('company_name'); $show->field('contact_phone'); $show->field('director'); - $show->field('license_pic'); + $show->field('business_license'); $show->field('logo'); $show->field('name'); $show->field('rate'); diff --git a/app/AdminSupplier/Forms/SupplierInfo.php b/app/AdminSupplier/Forms/SupplierInfo.php index c5c182f..71db781 100644 --- a/app/AdminSupplier/Forms/SupplierInfo.php +++ b/app/AdminSupplier/Forms/SupplierInfo.php @@ -28,7 +28,7 @@ class SupplierInfo extends Form $model->contact_phone = $input['contact_phone']; $model->avatar = $input['avatar']; $model->logo = $input['logo']; - //$model->license_pic = $input['license_pic']; + //$model->business_license = $input['business_license']; $model->status = UserStatus::UNAUDITED; $model->save(); @@ -52,7 +52,7 @@ class SupplierInfo extends Form $this->text('contact_phone')->required(); $this->image('avatar'); $this->image('logo')->required(); - $this->image('license_pic')->required()->disable(); + $this->image('business_license')->required()->disable(); $this->confirm('编辑确认', '编辑内容需要管理员重新审核，确定要提交吗？'); } diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 39ff31c..f82f5fe 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -86,7 +86,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection director * @property Grid\Column|Collection legal_persona_name * @property Grid\Column|Collection legal_persona_wechat - * @property Grid\Column|Collection license_pic + * @property Grid\Column|Collection business_license * @property Grid\Column|Collection logo * @property Grid\Column|Collection mchid * @property Grid\Column|Collection mchkey @@ -279,7 +279,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection director(string $label = null) * @method Grid\Column|Collection legal_persona_name(string $label = null) * @method Grid\Column|Collection legal_persona_wechat(string $label = null) - * @method Grid\Column|Collection license_pic(string $label = null) + * @method Grid\Column|Collection business_license(string $label = null) * @method Grid\Column|Collection logo(string $label = null) * @method Grid\Column|Collection mchid(string $label = null) * @method Grid\Column|Collection mchkey(string $label = null) @@ -477,7 +477,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection director * @property Show\Field|Collection legal_persona_name * @property Show\Field|Collection legal_persona_wechat - * @property Show\Field|Collection license_pic + * @property Show\Field|Collection business_license * @property Show\Field|Collection logo * @property Show\Field|Collection mchid * @property Show\Field|Collection mchkey @@ -670,7 +670,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection director(string $label = null) * @method Show\Field|Collection legal_persona_name(string $label = null) * @method Show\Field|Collection legal_persona_wechat(string $label = null) - * @method Show\Field|Collection license_pic(string $label = null) + * @method Show\Field|Collection business_license(string $label = null) * @method Show\Field|Collection logo(string $label = null) * @method Show\Field|Collection mchid(string $label = null) * @method Show\Field|Collection mchkey(string $label = null) diff --git a/ready.md b/ready.md index 98a73e3..f24394a 100644 --- a/ready.md +++ b/ready.md @@ -61,12 +61,12 @@ ALTER TABLE `products` # 代理商管理员 lingfeng16888 -INSERT INTO `agents` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `appid`, `appsecret`, `mchid`, `mchkey`, `status`, `type`, `company_name`, `logo`, `address`, `license_pic`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) +INSERT INTO `agents` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `appid`, `appsecret`, `mchid`, `mchkey`, `status`, `type`, `company_name`, `logo`, `address`, `business_license`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, '', '', '', '', 1, 1, '总管理员', '', '', '', '总管理员', '13988889999', 0.00, NOW(), NOW(), NULL); INSERT INTO `admin_agent_role_users` (`role_id`, `user_id`, `created_at`, `updated_at`) VALUES (1, 1, '2021-07-20 01:44:48', '2021-07-20 01:44:48'); # 供应商管理员 lingfeng16888 -INSERT INTO `suppliers` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `status`, `company_name`, `logo`, `address`, `license_pic`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) +INSERT INTO `suppliers` (`id`, `username`, `password`, `name`, `avatar`, `remember_token`, `status`, `company_name`, `logo`, `address`, `business_license`, `director`, `contact_phone`, `rate`, `created_at`, `updated_at`, `deleted_at`) VALUES (1, '领峰云', '$2y$10$7liU0oe8arMoM9hs992bJeqhlSyn6krdpaeX8zGJSp1RzcHO1qKvq', '总管理员', NULL, NULL, 1, '总管理员', '', '', '', '总管理员', '13988889999', 0.00, '2021-08-26 11:28:17', '2021-08-30 17:45:14', NULL); INSERT INTO `admin_supplier_role_users` (`role_id`, `user_id`, `created_at`, `updated_at`) VALUES (1, 1, '2021-07-20 01:44:48', '2021-07-20 01:44:48'); diff --git a/resources/lang/zh_CN/agent.php b/resources/lang/zh_CN/agent.php index 5a9addf..031cf15 100644 --- a/resources/lang/zh_CN/agent.php +++ b/resources/lang/zh_CN/agent.php @@ -22,7 +22,7 @@ return [ 'credit_codes' => '统一社会信用代码', 'logo' => 'LOGO', 'address' => '公司地址', - 'license_pic' => '营业执照', + 'business_license' => '营业执照', 'director' => '负责人', 'legal_persona_name' => '法人姓名', 'legal_persona_wechat' => '法人微信号', diff --git a/resources/lang/zh_CN/supplier.php b/resources/lang/zh_CN/supplier.php index a9a25cf..f7a2116 100644 --- a/resources/lang/zh_CN/supplier.php +++ b/resources/lang/zh_CN/supplier.php @@ -12,7 +12,7 @@ return [ 'company_name' => '公司名称', 'logo' => 'LOGO', 'address' => '公司地址', - 'license_pic' => '营业执照', + 'business_license' => '营业执照', 'director' => '负责人', 'contact_phone' => '联系电话', 'rate' => '抽成比例',