diff --git a/app/Admin/Controllers/v3/BannersController.php b/app/Admin/Controllers/v3/BannersController.php index 1acb0fb..92576a9 100644 --- a/app/Admin/Controllers/v3/BannersController.php +++ b/app/Admin/Controllers/v3/BannersController.php @@ -105,7 +105,7 @@ class BannersController extends AdminController }); }); $form->column(6, function (Form $form) { - $form->image('cover')->required()->uniqueName(); + $form->image('cover')->autoUpload()->required()->uniqueName(); $form->select('cover_type')->options(BannersModel::$_COVER_TYPE)->required(); $form->text('path')->default(''); $form->select('path_type')->options(BannersModel::$_PATH_TYPE)->default(''); diff --git a/app/Admin/Controllers/v3/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php index 796df82..b051b19 100644 --- a/app/Admin/Controllers/v3/CategoryController.php +++ b/app/Admin/Controllers/v3/CategoryController.php @@ -53,7 +53,7 @@ class CategoryController extends AdminController $form->select('parent_id')->default(0)->options($parentList); $form->text('title')->required(); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required()->uniqueName(); $form->number('sort'); diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 57b9730..968e61c 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -142,7 +142,7 @@ class GoodsActivityController extends AdminController $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required(); $form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale'); $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->help($form->model()->expire_time_text); }); @@ -161,13 +161,13 @@ class GoodsActivityController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->width(2)->uniqueName(); + $form->image('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_banners', function (Form\NestedForm $form) { - $form->file('path')->width(2)->uniqueName(); + $form->file('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/GoodsCategoryController.php b/app/Admin/Controllers/v3/GoodsCategoryController.php index fb84a0f..c268b1a 100644 --- a/app/Admin/Controllers/v3/GoodsCategoryController.php +++ b/app/Admin/Controllers/v3/GoodsCategoryController.php @@ -75,7 +75,7 @@ class GoodsCategoryController extends AdminController $category = CategoryModel::getArray([['parent_id','>',0]]); $form->select('category_id')->width(4)->required()->options($category); $form->text('title')->width(4)->required(); - $form->image('cover_img')->width(2)->uniqueName(); + $form->image('cover_img')->autoUpload()->width(2)->uniqueName(); $form->number('sort'); $form->disableResetButton(); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 48c761f..6832a97 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -165,7 +165,7 @@ class GoodsController extends AdminController $form->select('goods_category_id')->required(); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required(); $form->number('sort'); }); $form->column(6, function (Form $form) { @@ -180,13 +180,13 @@ class GoodsController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->required()->width(2)->uniqueName(); + $form->image('path')->autoUpload()->required()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_banners', function (Form\NestedForm $form) { - $form->file('path')->width(2); + $form->file('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 191e2f6..5d87537 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -184,7 +184,7 @@ class GoodsNewController extends AdminController $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->url('ops/files')->required(); + $form->image('cover_img')->autoUpload()->url('ops/files')->required(); $form->number('sort'); }); $form->column(6, function (Form $form) { @@ -199,13 +199,13 @@ class GoodsNewController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_new_banners', function (Form\NestedForm $form) { - $form->image('path')->url('ops/files')->width(2); + $form->image('path')->autoUpload()->url('ops/files')->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_new_banners', function (Form\NestedForm $form) { - $form->file('path')->url('ops/files')->width(2); + $form->file('path')->autoUpload()->url('ops/files')->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index bb23ae7..e641621 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -116,7 +116,7 @@ class ServicePersonnelController extends AdminController $form->hidden('id'); $form->text('name')->required(); $form->text('tel')->required(); - $form->image('head_url'); + $form->image('head_url')->autoUpload(); }); $form->column(6,function(Form $form) use($marketList,$userList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 6ed6431..848ffd0 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -187,7 +187,7 @@ class StoreController extends AdminController $form->select('market_id')->required()->options($marketList); $form->select('category_id')->options($categoryList); $form->text('name')->required()->maxLength(50); - $form->image('logo')->required()->uniqueName(); + $form->image('logo')->autoUpload()->required(); $form->mobile('tel'); $form->text('link_name')->required(); $form->mobile('link_tel')->required(); @@ -209,9 +209,9 @@ class StoreController extends AdminController $form->text('address')->required(); }); $form->column(6, function (Form $form) { - $form->image('business_license')->required()->uniqueName(); - $form->image('zm_img')->required()->uniqueName(); - $form->image('fm_img')->required()->uniqueName(); + $form->image('business_license')->autoUpload()->required(); + $form->image('zm_img')->autoUpload()->required(); + $form->image('fm_img')->autoUpload()->required(); // $form->select('admin_id')->options($userList)->required(); // $form->select('user_id')->options($userList)->required(); $form->number('admin_id')->required()->min(0); @@ -226,8 +226,8 @@ class StoreController extends AdminController $form->column(12, function (Form $form) { $form->map('lat','lng','地址'); $form->textarea('introduction')->required(); - $form->textarea('announcement'); - $form->multipleImage('environment'); + $form->textarea('announcement')->default(''); + $form->multipleImage('environment')->autoUpload()->default(''); }); // $form->text('coordinates')->width(4) @@ -235,13 +235,20 @@ class StoreController extends AdminController // ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); $form->saving(function(Form $form){ $id = $form->getKey(); - $adminId = $form->input('admin_id'); - $store = StoreModel::select('id')->where([ - ['admin_id','=',$adminId], - ['id','<>',$id?$id:0], - ])->first(); - if(!empty($store)){ - return $form->error('管理员已经绑定了店铺'); + $adminId = $form->input('admin_id'); + if(!empty($id) && !empty($adminId)){ + $user = UserModel::getUserInfo($adminId,'id'); + if(empty($user)){ + return $form->error('管理员不存在'); + } + $store = StoreModel::select('id')->where([ + ['admin_id','=',$adminId], + ['id','<>',$id?$id:0], + ])->first(); + + if(!empty($store)){ + return $form->error('管理员已经绑定了店铺'); + } } }); $form->saved(function (Form $form){