微调

app/Admin/Controllers/Activity/IndexController.php

@@ -2,6 +2,8 @@
 
 namespace App\Admin\Controllers\Activity;
 
+use App\Admin\Renderable\Activity\Grants;
+use App\Admin\Renderable\Activity\Verifications;
 use App\Models\Activity;
 use App\Models\ActivityRule;
 use App\Models\User;
@@ -18,7 +20,7 @@ class IndexController extends AdminController
     protected function grid(): Grid
     {
         $grid = new Grid(new Activity);
-        $grid->model()->withCount('coupons');
+        $grid->model()->with(['rule', 'grants', 'verifications'])->withCount('coupons');
 
         $grid->actions(function ($actions) {
             $actions->disableView();
@@ -28,15 +30,14 @@ class IndexController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->equal('status', '状态')->select(Activity::STATUS);
                 $filter->equal('type', '类型')->select(Activity::TYPES);
+                $filter->equal('code', '活动编号');
             });
 
             $filter->column(1 / 2, function ($filter) {
                 $filter->between('start_at', '开始时间')->datetime();
                 $filter->between('end_at', '结束时间')->datetime();
                 $filter->equal('channel', '核销途径')->select(Activity::CHANNELS);
-
             });
-
         });
 
         $grid->column('id', '#ID#');
@@ -48,13 +49,13 @@ class IndexController extends AdminController
         $grid->column('类型')->display(function () {
             return $this->type_text;
         });
-
         $grid->column('channel', '核销途径')
             ->using(Activity::CHANNELS)
             ->label([
                 Activity::CHANNEL_YSD   => 'info',
                 Activity::CHANNEL_UNION => 'success',
             ]);
+<<<<<<< HEAD
 
         $grid->column('days', '延期(天)');
         $grid->column('rule.full', '满足金额');
@@ -74,6 +75,17 @@ class IndexController extends AdminController
             ->label()
             ->width(350)
             ->hide();
+=======
+        $grid->column('days', '延期(天)');
+        $grid->column('rule.full', '满足金额');
+        $grid->column('rule.take', '扣除金额');
+        $grid->column('发券渠道')->display(function ($title, $column) {
+            return '查看';
+        })->modal(Grants::class);
+        $grid->column('核券渠道')->display(function ($title, $column) {
+            return '查看';
+        })->modal(Verifications::class);
+>>>>>>> a7719d7038809738262e66c70e301947845f680d
 
         $grid->column('开始时间')->display(function () {
             return $this->type == Activity::TYPE_SCOPE ? $this->start_at->format('Y-m-d') : '---';
@@ -123,7 +135,10 @@ class IndexController extends AdminController
             ->when(Activity::TYPE_SCOPE, function (Form $form) {
                 $form->dateRange('start_at', 'end_at', '有效时间');
             })
+<<<<<<< HEAD
             ->help('当月券，领取的月底到期')
+=======
+>>>>>>> a7719d7038809738262e66c70e301947845f680d
             ->required();
 
         $form->radio('channel', '核销途径')
@@ -131,8 +146,11 @@ class IndexController extends AdminController
             ->default(Activity::CHANNEL_YSD)
             ->help('券码核销的途径：亿时代是自己核销，银联是银联pos核销')
             ->required();
+<<<<<<< HEAD
 
         $form->number('day_times','每天可用次数')->default(0)->help('每天可用次数，0未不限制');
+=======
+>>>>>>> a7719d7038809738262e66c70e301947845f680d
 
         $form->switch('status', '状态')->default(1);
         $form->switch('need_check', '多次校验')