[更新] 调整活动

app/Admin/Controllers/Activity/IndexController.php

@@ -32,7 +32,7 @@ class IndexController extends AdminController
 
     /**
      * Index interface.
-     * @param Content $content
+     * @param  Content  $content
      * @return Content
      */
     public function index(Content $content)
@@ -45,8 +45,8 @@ class IndexController extends AdminController
 
     /**
      * Edit interface.
-     * @param mixed   $id
-     * @param Content $content
+     * @param  mixed    $id
+     * @param  Content  $content
      * @return Content
      */
     public function edit($id, Content $content)
@@ -59,7 +59,7 @@ class IndexController extends AdminController
 
     /**
      * Create interface.
-     * @param Content $content
+     * @param  Content  $content
      * @return Content
      */
     public function create(Content $content)
@@ -93,6 +93,8 @@ class IndexController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->between('start_at', '开始时间')->datetime();
                 $filter->between('end_at', '结束时间')->datetime();
+                $filter->equal('channel', '核销途径')->select(Activity::CHANNELS);
+
             });
 
         });
@@ -107,6 +109,13 @@ class IndexController extends AdminController
             return $this->type_text;
         });
 
+        $grid->column('channel', '核销途径')
+             ->using(Activity::CHANNELS)
+             ->label([
+                 Activity::CHANNEL_YSD   => 'info',
+                 Activity::CHANNEL_UNION => 'success',
+             ]);
+
         $grid->column('days', '延期(天)');
         $grid->column('rule.full', '满足金额');
         $grid->column('rule.take', '扣除金额');
@@ -173,6 +182,12 @@ class IndexController extends AdminController
              })
              ->required();
 
+        $form->radio('channel', '核销途径')
+             ->options(Activity::CHANNELS)
+             ->default(Activity::CHANNEL_YSD)
+             ->help('券码核销的途径：亿时代是自己核销，银联是银联pos核销')
+             ->required();
+
         $form->switch('status', '状态')->default(1);
         $form->switch('need_check', '多次校验')
              ->default(1)