更新

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -32,7 +32,7 @@ class ArticleController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);
         $grid->column('title', __('标题'))->limit(10,'...')->width(100);
-        $grid->column('content', __('内容'))->limit(20,'...')->width(200);
+//        $grid->column('content', __('内容'))->limit(20,'...')->width(200);
         $grid->column('banner_url', __('图片'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('created_at', __('创建时间'));
         $grid->column('updated_at', __('更新时间'));

app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php

@@ -37,11 +37,6 @@ class CouponDistributionUserList extends AdminController
                 0    => '黑名单',
                 1    => '正常',
             ]);
-            $filter->equal('is_pack','用户状态')->radio([
-                ''   => '全部用户',
-                0    => '普通用户',
-                1    => '服务包用户',
-            ]);
         });
         $grid->batchActions(function ($batch) {
             $batch->add(new CouponBatchGrant());
@@ -55,7 +50,6 @@ class CouponDistributionUserList extends AdminController
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('age', __('年龄'));
         $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);
-        $grid->column('is_pack', __('用户身份'))->using([0=>'普通用户',1=>'付费用户']);
         $grid->column('balance', __('当前余额'))->display(function ($price){
             return $price/100;
         });

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -224,8 +224,8 @@ class CouponManagementController extends AdminController
             ])->when(1, function (Form $form) {
                 $form->text('effective_days', __('有效天数'));
             })->when(2, function (Form $form) {
-                $form->date('start_time', __('有效期开始时间'));
-                $form->date('end_time', __('有效期结束时间'));
+                $form->datetime('start_time', __('有效期开始时间'));
+                $form->datetime('end_time', __('有效期结束时间'));
                 $form->saving(function ($form){
                     $form->start_time = strtotime($form->start_time);
                     $form->end_time = strtotime($form->end_time);

app/Admin/Controllers/VaccinesManagement/VaccinesController.php

@@ -65,7 +65,7 @@ class VaccinesController extends AdminController
             });
             $filter->column(1/2, function ($filter) {
                $filter->like('name','疫苗名称');
-                $filter->equal('organizationvaccines.org_id','机构')->select(Organization::pluck('name','id'));
+                $filter->equal('org_id','机构')->select(Organization::pluck('name','id'));
             });
         });
         //按关键字查询