diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 3c62395..8dd9914 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -196,9 +196,9 @@ class GoodsActivityController extends AdminController $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); if($form->isCreating()){ - $form->image('cover_img')->autoUpload()->retainable()->required(); + $form->image('cover_img')->uniqueName()->autoUpload()->retainable()->required(); }else{ - $form->image('cover_img')->autoUpload()->required(); + $form->image('cover_img')->uniqueName()->autoUpload()->required(); } $form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale'); $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->rules('after:now',['after'=>'活动结束时间必须大于当前时间!'])->customFormat(function ($v) { @@ -220,13 +220,13 @@ class GoodsActivityController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->autoUpload()->width(2); + $form->image('path')->uniqueName()->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')->autoUpload()->width(2); + $form->file('path')->uniqueName()->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 9b11b19..ace4190 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -220,9 +220,9 @@ class GoodsController extends AdminController $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); if($form->isCreating()){ - $form->image('cover_img')->autoUpload()->retainable()->required(); + $form->image('cover_img')->uniqueName()->autoUpload()->retainable()->required(); }else{ - $form->image('cover_img')->autoUpload()->required(); + $form->image('cover_img')->uniqueName()->autoUpload()->required(); } $form->number('sort'); }); @@ -238,13 +238,13 @@ class GoodsController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->autoUpload()->required()->width(2); + $form->image('path')->uniqueName()->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')->autoUpload()->width(2); + $form->file('path')->uniqueName()->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Forms/v3/GoodsImageForm.php b/app/Admin/Forms/v3/GoodsImageForm.php index d4b420b..3903377 100644 --- a/app/Admin/Forms/v3/GoodsImageForm.php +++ b/app/Admin/Forms/v3/GoodsImageForm.php @@ -30,7 +30,7 @@ class GoodsImageForm extends Form implements LazyRenderable $coverImg= $input['cover_img']; $bannerImg= $input['img_banner']; - if($goodsId > 0 && !empty($coverImg)){ + if($goodsId > 0 && !empty($coverImg) && strlen($coverImg) < 200){ $data = ['cover_img' => $coverImg]; $res1 = GoodsModel::where('id',$goodsId)->update($data); } @@ -63,15 +63,13 @@ class GoodsImageForm extends Form implements LazyRenderable $goodName = $this->payload['name'] ?? ''; $coverImg = $this->payload['cover_img'] ?? ''; $this->search = $this->payload['search'] ?? ''; - // $goods = GoodsModel::select('name','cover_img')->find($id); - // $goodName = empty($goods->name)?'':$goods->name; - // $coverImg = empty($goods->cover_img) ? '':$goods->cover_img; + $this->hidden('goods_id')->value($id); $this->display('name','商品名称')->value($goodName); - $this->image('cover_img','封面图')->customFormat(function($cover_img) use($coverImg){ + $this->image('cover_img','封面图')->uniqueName()->customFormat(function() use($coverImg){ return [$coverImg]; })->autoUpload(); - $this->multipleImage('img_banner','轮播图')->customFormat(function($img_banner) use($id){ + $this->multipleImage('img_banner','轮播图')->uniqueName()->customFormat(function() use($id){ if(!$id){ return ; }