From cff2d634f6f897bd7edf8148c8c02101b72ee0e5 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 20 Oct 2020 10:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8--=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/CouponController.php | 14 ++------------ app/Models/v3/Coupon.php | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/Admin/Controllers/v3/CouponController.php b/app/Admin/Controllers/v3/CouponController.php index ffb2ee8..267c7a3 100644 --- a/app/Admin/Controllers/v3/CouponController.php +++ b/app/Admin/Controllers/v3/CouponController.php @@ -281,7 +281,7 @@ class CouponController extends AdminController $form->saving(function (Form $form){ $tags = $form->input('tags'); - $activityAvailable = $form->input('activity_available'); + if( $form->discount_type == 2 && ($form->discounts <= 0 || $form->discounts >= 10)){ return $form->error('优惠金额请输入1~10之间的数字'); } @@ -296,17 +296,7 @@ class CouponController extends AdminController } }; $form->tags = json_encode($tagsArr); - $availableArr = []; - if(!empty($activityAvailable)){ - foreach($activityAvailable as $ka => $available){ - if(empty($available)){ - unset($activityAvailable[$ka]); - continue; - } - $availableArr[] = $available; - } - }; - $form->activity_available = json_encode($availableArr); + $form->remark = empty($form->input('remark')) ? '' : $form->input('remark'); }); diff --git a/app/Models/v3/Coupon.php b/app/Models/v3/Coupon.php index db5e89c..ad0582b 100644 --- a/app/Models/v3/Coupon.php +++ b/app/Models/v3/Coupon.php @@ -48,7 +48,7 @@ class Coupon extends Model 'market_ids'=>'array', 'category_ids'=>'array', // 'tags'=>'json', - // 'activity_available'=>'array' + 'activity_available'=>'array' ]; public function getStatusTextAttribute()