From 634ee602e0eaca726de99e81d2b735dc47f1563a Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Tue, 14 Sep 2021 12:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/SupplierController.php        | 6 +++---
 app/AdminSupplier/Controllers/ProductController.php | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php
index 098ba48..c12a717 100644
--- a/app/Admin/Controllers/SupplierController.php
+++ b/app/Admin/Controllers/SupplierController.php
@@ -124,7 +124,7 @@ class SupplierController extends AdminController
 			}
 			else if ($form->isEditing()) {
 				$form->display('username');
-				$form->text('password')->customFormat(fn() => '');
+				$form->text('password')->minLength(6)->customFormat(fn() => '');
 			}
             $form->text('name')->required();
 			$form->select('status', '状态')
@@ -132,10 +132,10 @@ class SupplierController extends AdminController
 				->default(UserStatus::NORMAL)
 				->help('如果禁用供应商，其下的<span style="color:#f00;">所有产品都会跟着下架</span>，包括代理商在售的产品')
 				->required();
-            $form->text('company_name');
+            $form->text('company_name')->required();
 			$form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required();
             $form->image('logo')->removable(false)->uniqueName();
-            $form->text('address');
+            $form->text('address')->required();
             $form->image('license_pic')->removable(false)->uniqueName();
             $form->text('director');
             $form->mobile('contact_phone');
diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php
index c642f6d..014c440 100644
--- a/app/AdminSupplier/Controllers/ProductController.php
+++ b/app/AdminSupplier/Controllers/ProductController.php
@@ -130,6 +130,7 @@ class ProductController extends AdminController
 				admin_trans('product.options.publish_type'),
 				array_flip(Admin::user()->publish_type)
 			);
+
 			$form->radio('type', '产品类型')
 				->options($publish_type)
 				->default(current(Admin::user()->publish_type))