From 151725c90a833b2e2a437d2d97b408bddd7e4ee2 Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 22 Oct 2021 00:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=AE=B8=E5=8F=AF?= =?UTF-8?q?=E8=AF=81=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BC=A0=E5=A4=9A=E5=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MySQL_change.sql | 15 +++++++++++++-- app/Admin/Controllers/SupplierController.php | 4 ++-- .../Controllers/SupplierController.php | 4 ++-- app/AdminSupplier/Forms/SupplierInfo.php | 4 ++-- app/Http/Controllers/Api/TestController.php | 2 +- app/Models/Supplier.php | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/MySQL_change.sql b/MySQL_change.sql index 3ed8dd8..d702b59 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -347,6 +347,17 @@ CREATE TABLE `settled_orders` ( ) COMMENT='商家入驻支付记录' COLLATE='utf8_general_ci' -ENGINE=InnoDB -; +ENGINE=InnoDB; + + + +# 11:21 ‎2021/‎10/‎20 修改DECIMAL长度 +ALTER TABLE `statement` + CHANGE COLUMN `price` `price` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '金额' AFTER `id`; + + + +# 0:22 ‎2021/‎10/‎22 修改长度 +ALTER TABLE `suppliers` + CHANGE COLUMN `license` `license` VARCHAR(1024) NOT NULL DEFAULT '' COMMENT '许可证' COLLATE 'utf8mb4_general_ci' AFTER `business_license`; diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 46ff9b1..d28da0a 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -137,9 +137,9 @@ class SupplierController extends AdminController ->help('如果禁用供应商，其下的所有产品都会跟着下架，包括代理商在售的产品') ->required(); $form->text('company_name')->required(); + $form->text('address')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); - $form->image('license')->required()->removable(false)->uniqueName(); - $form->text('address')->required(); + $form->multipleImage('license')->required()->removable(false)->uniqueName(); $form->image('business_license')->required()->removable(false)->uniqueName(); $form->text('credit_codes')->required(); $form->text('corporate_account')->required(); diff --git a/app/AdminSettled/Controllers/SupplierController.php b/app/AdminSettled/Controllers/SupplierController.php index abe08ae..5de096a 100644 --- a/app/AdminSettled/Controllers/SupplierController.php +++ b/app/AdminSettled/Controllers/SupplierController.php @@ -64,9 +64,9 @@ class SupplierController extends AdminController $form->password('password')->minLength(6)->required(); $form->text('name')->required(); $form->text('company_name')->required(); + $form->text('address')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); - $form->image('license')->required()->removable(false)->uniqueName(); - $form->text('address')->required(); + $form->multipleImage('license')->required()->removable(false)->uniqueName(); $form->image('business_license')->required()->removable(false)->uniqueName(); $form->text('credit_codes')->required(); $form->text('corporate_account')->required()->help('非常重要，该账号为默认提现账号'); diff --git a/app/AdminSupplier/Forms/SupplierInfo.php b/app/AdminSupplier/Forms/SupplierInfo.php index 0f60709..9035005 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->license = $input['license']; +// $model->license = $input['license']; //$model->business_license = $input['business_license']; $model->status = UserStatus::UNAUDITED; $model->save(); @@ -54,7 +54,7 @@ class SupplierInfo extends Form $this->text('director')->required(); $this->text('contact_phone')->required(); $this->image('avatar'); - $this->image('license')->required()->disable(); + $this->multipleImage('license')->required()->disable(); $this->image('business_license')->required()->disable(); $this->confirm('编辑确认', '编辑内容需要管理员重新审核，确定要提交吗？'); diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index 4e23dcf..fe0974c 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -15,7 +15,7 @@ class TestController { public function index() { - dd(Supplier::with('settledOrder')->find(2)->toArray()); + dd(Supplier::class); } /** diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index b5c7502..0dd1114 100644 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -10,7 +10,7 @@ class Supplier extends BaseModel { use HasFactory, SoftDeletes; - protected $casts = ['publish_type' => 'json']; + protected $casts = ['publish_type' => 'json', 'license' => 'json']; protected $dispatchesEvents = [ 'updated' => DepositUpdate::class