diff --git a/packages/banner/resources/lang/zh_CN/banner.php b/packages/banner/resources/lang/zh_CN/banner.php index 06f30b9..805dac7 100644 --- a/packages/banner/resources/lang/zh_CN/banner.php +++ b/packages/banner/resources/lang/zh_CN/banner.php @@ -12,7 +12,10 @@ return [ 'sort'=>'排序', 'is_enable'=>'启用', 'remarks'=> '备注', - 'ext'=>'扩展字段' + 'ext'=>'扩展字段', + 'ad' => [ + 'name' => '广告位' + ], ], 'options' => [ ], diff --git a/packages/banner/src/Http/Admin/BannerController.php b/packages/banner/src/Http/Admin/BannerController.php index 770992a..e7ec072 100644 --- a/packages/banner/src/Http/Admin/BannerController.php +++ b/packages/banner/src/Http/Admin/BannerController.php @@ -9,6 +9,7 @@ use Dcat\Admin\Widgets\Card; use Peidikeji\Banner\Models\Banner; use Dcat\Admin\Grid\Column as GridColumn; use Dcat\Admin\Http\Controllers\AdminController; +use Peidikeji\Banner\Models\BannerAd; class BannerController extends AdminController { @@ -18,10 +19,11 @@ class BannerController extends AdminController protected function grid() { - return Grid::make(new Banner(), function (Grid $grid) { + return Grid::make(Banner::with(['ad']), function (Grid $grid) { $grid->model()->sort(); $grid->disableRowSelector(); + $grid->column('ad.name'); $grid->column('path')->image('', 50); $grid->column('name'); $grid->column('sort'); @@ -60,6 +62,7 @@ class BannerController extends AdminController $grid->filter(function (Grid\Filter $filter) { $filter->panel(); $filter->expand(); + $filter->equal('ad_id')->select(BannerAd::pluck('name', 'id'))->width(3); $filter->like('name')->width(3); }); });