diff --git a/app/Admin/Controllers/Finance/CensusController.php b/app/Admin/Controllers/Finance/CensusController.php index 4cca85c..54fed32 100644 --- a/app/Admin/Controllers/Finance/CensusController.php +++ b/app/Admin/Controllers/Finance/CensusController.php @@ -17,10 +17,10 @@ class CensusController extends AdminController /** * Index interface. - * @param Content $content + * @param Content $content * @return Content */ - public function index(Content $content) + public function index(Content $content): Content { return $content ->header('核销总数据') @@ -30,10 +30,10 @@ class CensusController extends AdminController /** * 今日核销数据 - * @param Content $content [description] - * @return [type] [description] + * @param Content $content [description] + * @return \Encore\Admin\Layout\Content [type] [description] */ - public function today(Content $content) + public function today(Content $content): Content { $this->today = true; @@ -43,14 +43,14 @@ class CensusController extends AdminController ->body($this->grid()); } - protected function grid() + protected function grid(): Grid { $grid = new Grid(new User); $grid->model() - ->whereHas('identity', function ($q) { - $q->where('identity_id', 1); - }); + ->whereHas('identity', function ($q) { + $q->where('identity_id', 1); + }); $grid->disableCreateButton(); $grid->disableBatchActions(); @@ -74,9 +74,10 @@ class CensusController extends AdminController $rules = ActivityRule::get(); foreach ($rules as $rule) { - $grid->column($rule->title)->display(function () use ($today, $rule) { - return $this->getCouponCount($rule->code, $today); - }); + $grid->column(str_replace('.', '。', $rule->title)) + ->display(function () use ($today, $rule) { + return $this->getCouponCount($rule->code, $today); + }); } // $grid->column('100元减10元优惠券')->display(function () use ($today) { // return $this->getCouponCount('YSD-full100-10', $today);