diff --git a/MySQL_change.sql b/MySQL_change.sql index 03b1c2b..8988562 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -226,4 +226,8 @@ ALTER TABLE `agent_products` 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`; + CHANGE COLUMN `license_pic` `business_license` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '营业执照' COLLATE 'utf8_general_ci' AFTER `address`, + ADD COLUMN `license` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '许可证' AFTER `business_license`, + ADD COLUMN `credit_codes` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '统一社会信用代码' COLLATE 'utf8_general_ci' AFTER `license`, + ADD COLUMN `corporate_account` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '对公账号' AFTER `credit_codes`, + ADD COLUMN `deposit_bank` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '开户行' AFTER `corporate_account`; diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 58795f3..053e954 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -37,7 +37,7 @@ class SupplierController extends AdminController $grid->column('username'); // $grid->column('name'); $grid->column('company_name'); - $grid->column('logo')->image('', 60, 60); + $grid->column('license')->image('', 60, 60); $grid->column('address'); $grid->column('business_license')->image('', 60,60); $grid->column('director'); @@ -87,7 +87,7 @@ class SupplierController extends AdminController $show->field('username'); $show->field('name'); $show->field('company_name'); - $show->field('logo')->image('', 60, 60); + $show->field('license')->image('', 60, 60); $show->field('address'); $show->field('business_license')->image('', 60, 60); $show->field('director'); @@ -135,9 +135,12 @@ class SupplierController extends AdminController ->required(); $form->text('company_name')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); - $form->image('logo')->removable(false)->uniqueName(); + $form->image('license')->required()->removable(false)->uniqueName(); $form->text('address')->required(); - $form->image('business_license')->removable(false)->uniqueName(); + $form->image('business_license')->required()->removable(false)->uniqueName(); + $form->text('credit_codes')->required(); + $form->text('corporate_account')->required(); + $form->text('deposit_bank')->required(); $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 f1ec72b..ddbe85c 100644 --- a/app/AdminAgent/Controllers/SupplierController.php +++ b/app/AdminAgent/Controllers/SupplierController.php @@ -36,7 +36,7 @@ class SupplierController extends AdminController $grid->column('address'); $grid->column('director'); $grid->column('contact_phone'); - $grid->column('logo')->image('', 60, 60); + $grid->column('license')->image('', 60, 60); $grid->column('avatar')->image('', 60, 60); $grid->column('business_license')->image('', 60, 60); $grid->column('created_at', '入驻时间'); @@ -65,7 +65,7 @@ class SupplierController extends AdminController $show->field('address'); $show->field('director'); $show->field('contact_phone'); - $show->field('logo'); + $show->field('license'); $show->field('avatar'); $show->field('business_license'); $show->field('created_at'); diff --git a/app/AdminSettled/Controllers/SupplierController.php b/app/AdminSettled/Controllers/SupplierController.php index 3015062..6932e35 100644 --- a/app/AdminSettled/Controllers/SupplierController.php +++ b/app/AdminSettled/Controllers/SupplierController.php @@ -60,9 +60,12 @@ class SupplierController extends AdminController $form->text('name')->required(); $form->text('company_name')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); - $form->image('logo')->removable(false)->uniqueName(); + $form->image('license')->required()->removable(false)->uniqueName(); $form->text('address')->required(); $form->image('business_license')->required()->removable(false)->uniqueName(); + $form->text('credit_codes')->required(); + $form->text('corporate_account')->required()->help('非常重要，该账号为默认提现账号'); + $form->text('deposit_bank')->required(); $form->text('director')->required(); $form->text('contact_phone')->required()->maxLength(13); })->saving(function (Form $form) { diff --git a/app/AdminSupplier/Forms/SupplierInfo.php b/app/AdminSupplier/Forms/SupplierInfo.php index 71db781..0f60709 100644 --- a/app/AdminSupplier/Forms/SupplierInfo.php +++ b/app/AdminSupplier/Forms/SupplierInfo.php @@ -27,7 +27,7 @@ class SupplierInfo extends Form $model->director = $input['director']; $model->contact_phone = $input['contact_phone']; $model->avatar = $input['avatar']; - $model->logo = $input['logo']; + $model->license = $input['license']; //$model->business_license = $input['business_license']; $model->status = UserStatus::UNAUDITED; $model->save(); @@ -47,11 +47,14 @@ class SupplierInfo extends Form $this->display('city.name','城市'); $this->display('area.name','地区'); $this->display('address'); + $this->display('credit_codes'); + $this->display('corporate_account'); + $this->display('deposit_bank'); $this->text('name')->required(); $this->text('director')->required(); $this->text('contact_phone')->required(); $this->image('avatar'); - $this->image('logo')->required(); + $this->image('license')->required()->disable(); $this->image('business_license')->required()->disable(); $this->confirm('编辑确认', '编辑内容需要管理员重新审核，确定要提交吗？'); diff --git a/resources/lang/zh_CN/supplier.php b/resources/lang/zh_CN/supplier.php index f7a2116..61aa364 100644 --- a/resources/lang/zh_CN/supplier.php +++ b/resources/lang/zh_CN/supplier.php @@ -13,10 +13,14 @@ return [ 'logo' => 'LOGO', 'address' => '公司地址', 'business_license' => '营业执照', + 'license' => '许可证', 'director' => '负责人', 'contact_phone' => '联系电话', 'rate' => '抽成比例', 'publish_type' => '可发布产品类型', + 'credit_codes' => '统一社会信用代码', + 'corporate_account' => '对公账号', + 'deposit_bank' => '对公账号开户行', ], 'options' => [ ],