diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php index 00a4e38..83ba2a0 100644 --- a/app/Admin/Controllers/Coupon/IndexController.php +++ b/app/Admin/Controllers/Coupon/IndexController.php @@ -26,7 +26,10 @@ class IndexController extends AdminController $grid->disableBatchActions(); $grid->disableActions(); - $grid->model()->whereIn('status', [2, 3])->orderBy('id', 'desc'); + $grid->model() + ->with(['outlet.province', 'outlet.city', 'outlet.district', 'user', 'user.info']) + ->whereIn('status', [2, 3]) + ->orderBy('id', 'desc'); $grid->filter(function ($filter) { $filter->column(1 / 2, function ($filter) { @@ -113,22 +116,21 @@ class IndexController extends AdminController }); $grid->footer(function ($query) { - $all = $query->get(); - $pass = $all->where('status', 2)->all(); - $pass = collect($pass); + // $all = $query->get(); + // $pass = $all->where('status', 2)->all(); + // $pass = collect($pass); + $total = $query->count(); + $success = $query->where('status', 2)->count(); + $faield = $total - $success; - return '  ' - . '  ' - . '  ' - . '  ' - . '  ' - . '  '; + return '  ' + . '  ' + . '  ' + . '  ' + . '  ' + . '  '; }); - - - $grid->disableExport(false); $grid->export(function ($export) { @@ -150,51 +152,4 @@ class IndexController extends AdminController return $grid; } - /** - * Make a form builder. - * @return Form - */ - protected function form() - { - $form = new Form(new Gift); - - $form->text('title', '商品名称')->required(); - $form->decimal('price', '价格')->required()->default('1'); - $form->decimal('pv', 'PV')->required()->default(0); - $form->decimal('bonus', '主播佣金')->required()->default(0); - $form->decimal('recommend', '推荐人佣金')->required()->default(0); - $form->number('hots', '热度/亲密度')->required()->default('1'); - $form->text('times', '显示时间') - ->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(); - - $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) { - admin_warning('配置错误', 'PV+佣金+推荐人佣金不能超过礼物价值'); - throw new \Exception('配置错误,PV+佣金+推荐人佣金不能超过礼物价值'); - } - }); - - return $form; - } - }