From 6a6a1bd933238a6c1693d672927c62398ef5c7c5 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 5 Nov 2020 11:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B4=BB=E5=8A=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE--=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/v3/GoodsActivitySettingForm.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Forms/v3/GoodsActivitySettingForm.php b/app/Admin/Forms/v3/GoodsActivitySettingForm.php
index c8b69c2..2e477cd 100644
--- a/app/Admin/Forms/v3/GoodsActivitySettingForm.php
+++ b/app/Admin/Forms/v3/GoodsActivitySettingForm.php
@@ -86,7 +86,11 @@ class GoodsActivitySettingForm extends Form
                 return $this->error('请选择正确的首页展示的活动类型！');
             break;
         }
-        
+        if($setting['show_type'] == 'image' && empty($setting['index_image'])){
+            return $this->error('请上传首页大图！');
+        }else if($setting['show_type'] == 'image' && empty($setting['index_url'])){
+            return $this->error('请填写跳转链接');
+        }
         $activitySetting[$activitySetting['index_activity_type']] = json_encode($setting);
 
         $res1 = Redis::hmset(RedisKey::ACTIVITY_TYPE_LIMIT_NUMS , $data);
@@ -130,7 +134,7 @@ class GoodsActivitySettingForm extends Form
                 $sData = $settingData[1] ?? [];
                 $showType = $sData['show_type'] ?? 'list';
                 $form->number('buy_num_limit_1','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品，单笔订单可购买商品个数');
-                $form->image('banner_1','banner')->autoUpload()->saveFullUrl()
+                $form->image('banner_1','banner')->required()->autoUpload()->saveFullUrl()
                     ->customFormat(function() use($sData){
                         return [$sData['banner'] ?? ''];
                     })->width(3);
@@ -156,7 +160,7 @@ class GoodsActivitySettingForm extends Form
                 $sData = $settingData[2] ?? [];
                 $showType = $sData['show_type'] ?? 'list';
                 $form->number('buy_num_limit_2','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品，单笔订单可购买商品个数');
-                $form->image('banner_2','banner')->autoUpload()->saveFullUrl()
+                $form->image('banner_2','banner')->required()->autoUpload()->saveFullUrl()
                     ->customFormat(function() use($sData){
                         return [$sData['banner'] ?? ''];
                     })->width(3);
@@ -180,7 +184,7 @@ class GoodsActivitySettingForm extends Form
                 $sData = $settingData[3] ?? [];
                 $showType = $sData['show_type'] ?? 'list';
                 $form->number('buy_num_limit_3','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品，单笔订单可购买商品个数');
-                $form->image('banner_3','banner')->autoUpload()->saveFullUrl()
+                $form->image('banner_3','banner')->required()->autoUpload()->saveFullUrl()
                     ->customFormat(function() use($sData){
                         return [$sData['banner'] ?? ''];
                     })->width(3);