diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 920af7f..fadac4f 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -31,11 +31,12 @@ class GoodsActivityController extends AdminController protected function grid() { $marketId = Auth::getMarket(); + $build = new GoodsActivity(); if ($marketId){ - $build = new \App\Models\v3\Goods(); + //$build = new \App\Models\v3\Goods(); $build = $build::where('market_id',$marketId); }else{ - $build = new GoodsActivity(); + //$build = new GoodsActivity(); } return Grid::make($build, function (Grid $grid) { // 二级分类 @@ -74,7 +75,7 @@ class GoodsActivityController extends AdminController $grid->column('sort'); $grid->column('on_sale')->switch(); $grid->model()->orderby('id','desc'); - + $grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){ $filter->equal('id'); $filter->like('name'); @@ -134,7 +135,7 @@ class GoodsActivityController extends AdminController $show->width(6)->field('tags')->as(function ($value){ return $value; }); - + $show->width(6)->field('spec')->as(function ($value){ $text = ''; foreach ($value as $v){ @@ -144,10 +145,10 @@ class GoodsActivityController extends AdminController }); // $show->width(6)->field('details_imgs'); $show->width(6)->field('remark'); - + $show->width(6)->field('created_at'); $show->width(6)->field('updated_at'); - }); + }); }); } @@ -199,7 +200,7 @@ class GoodsActivityController extends AdminController $form->number('start_num')->attribute('min', 1)->default(1); $form->number('time_limit_days')->help('A时间段内限购'); $form->number('time_limit_num')->help('A时间段内限购的数量'); - $form->switch('can_use_coupon'); + $form->switch('can_use_coupon'); }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { @@ -300,7 +301,7 @@ class GoodsActivityController extends AdminController }); } - + public function SettingForm(Content $content) { return $content