diff --git a/app/Admin/Controllers/CouponController.php b/app/Admin/Controllers/CouponController.php index e28affc..2ddd145 100644 --- a/app/Admin/Controllers/CouponController.php +++ b/app/Admin/Controllers/CouponController.php @@ -57,7 +57,7 @@ class CouponController extends AdminController $filter->equal('discount_type')->select(config('coupon.discount_type')); $filter->equal('active_type')->select(config('coupon.active_type')); $status = config('coupon.status'); - unset($status[-1]); + unset($status[-1]);/* 去掉删除状态 */ $filter->in('status')->multipleSelect($status); }); }); @@ -159,9 +159,7 @@ class CouponController extends AdminController $form->radio('discount_type')->options(config('coupon.discount_type'))->default(1)->required(); $form->text('inventory')->width(2)->required()->type('number')->attribute('min', 1)->default(1); - $form->datetime('start_time_text')->width(3)->required() - // ->value($startTime) - ; + $form->datetime('start_time')->width(3)->required()->value($startTime); $form->datetime('end_time')->width(3)->required()->value($endTime); $form->datetime('usable_start_time')->width(3)->required()->value($usableStartTime); $form->datetime('usable_end_time')->width(3)->required() @@ -191,9 +189,14 @@ class CouponController extends AdminController $form->text('remark')->maxLength(500,'最多只能输入500个字'); $form->saving(function (Form $form){ - if( $form->discount_type == 2 && $form->discount > 0 && $form->discount < 10){ + // var_dump($form->discount_type); + // dd($form->discounts); + if( $form->discount_type == 2 && ($form->discounts <= 0 || $form->discounts >= 10)){ return $form->error('优惠金额请输入1~10之间的数字'); } + $form->start_time = $form->start_time_text; + // var_dump($form->start_time); + // dd($form->start_time_text); $this->receive_type = $form->receive_type; $form->deleteInput('receive_type'); $form->deleteInput('start_time_text'); diff --git a/app/Models/Coupon.php b/app/Models/Coupon.php index e339fdb..54ecd1c 100644 --- a/app/Models/Coupon.php +++ b/app/Models/Coupon.php @@ -111,7 +111,6 @@ class Coupon extends Model // 设置 protected function setStartTimeAttribute($value) { - $value = $this->start_time_text; $this->attributes['start_time'] = strtotime($value); }