diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php index 829af7e..1a33a86 100644 --- a/app/Admin/Controllers/Coupon/IndexController.php +++ b/app/Admin/Controllers/Coupon/IndexController.php @@ -2,7 +2,6 @@ namespace App\Admin\Controllers\Coupon; -use App\Admin\Exporters\CouponExport; use App\Models\ActivityRule; use App\Models\Coupon; use App\Models\User; @@ -37,12 +36,12 @@ class IndexController extends AdminController ]); $filter->between('created_at', '核销时间')->datetime(); $users = User::query() - ->whereHas('identity', function ($query) { - $query->where('identity_id', 1); - }) - ->where('type', 'pingan') - ->get() - ->pluck('nickname', 'id'); + ->whereHas('identity', function ($query) { + $query->where('identity_id', 1); + }) + ->where('type', 'pingan') + ->get() + ->pluck('nickname', 'id'); $filter->equal('user_id', '渠道')->select($users); $filter->equal('thirdPartyGoodsId', '优惠政策')->select(ActivityRule::pluck('title', 'code')); }); @@ -65,11 +64,11 @@ class IndexController extends AdminController return $this->user->nickname; }); $grid->column('type', '类型') - ->using(Coupon::TYPES) - ->label([ - '1' => 'info', - '2' => 'success', - ]); + ->using(Coupon::TYPES) + ->label([ + '1' => 'info', + '2' => 'success', + ]); $grid->column('网点名称/编号')->display(function () { return $this->outlet ? $this->outlet->nickname : $this->outletId; @@ -119,13 +118,13 @@ class IndexController extends AdminController $pass = collect($pass); return '  ' - . '  ' - . '  ' - . '  ' - . '  ' - . '  '; + . '  ' + . '  ' + . '  ' + . '  ' + . '  '; }); $grid->disableExport(false); @@ -163,30 +162,30 @@ class IndexController extends AdminController $form->decimal('recommend', '推荐人佣金')->required()->default(0); $form->number('hots', '热度/亲密度')->required()->default('1'); $form->text('times', '显示时间') - ->default('200') - ->required() - ->help('礼物显示时间,毫秒'); + ->default('200') + ->required() + ->help('礼物显示时间,毫秒'); $form->textarea('description', '礼物说明'); $form->image('cover', '封面') - ->rules(function ($form) { - if ($form->model()->cover != '') { - return 'nullable|image'; - } else { - return 'required'; - } - }) - ->move('images/' . date('Y/m/d')) - ->removable() - ->uniqueName(); + ->rules(function ($form) { + if ($form->model()->cover != '') { + return 'nullable|image'; + } else { + return 'required'; + } + }) + ->move('images/' . date('Y/m/d')) + ->removable() + ->uniqueName(); $form->switch('status', '状态')->default(1); $form->decimal('sort', '排序')->default(0)->help('序号越大越靠前'); $form->saving(function ($form) { - $sum = (int)$form->pv + (int)$form->bonus + (int)$form->recommend; - if ((int)$sum > $form->price) { + $sum = (int) $form->pv + (int) $form->bonus + (int) $form->recommend; + if ((int) $sum > $form->price) { admin_warning('配置错误', 'PV+佣金+推荐人佣金不能超过礼物价值'); throw new \Exception('配置错误,PV+佣金+推荐人佣金不能超过礼物价值'); } diff --git a/app/Api/Controllers/UserController.php b/app/Api/Controllers/UserController.php index f318e98..d559458 100644 --- a/app/Api/Controllers/UserController.php +++ b/app/Api/Controllers/UserController.php @@ -166,7 +166,7 @@ class UserController extends Controller 'redemptionCode' => 'required', 'total' => 'required', 'outletId' => 'required', - 'orderid' => 'nullable|min:10', +// 'orderid' => 'nullable|min:100', ], [ 'redemptionCode.required' => '缺少卡券兑换码', 'total.required' => '缺少订单总额', diff --git a/public/index.php b/public/index.php index 4584cbc..6ed8bae 100644 --- a/public/index.php +++ b/public/index.php @@ -8,7 +8,7 @@ */ define('LARAVEL_START', microtime(true)); - +echo phpinfo(); /* |-------------------------------------------------------------------------- | Register The Auto Loader