|
|
@ -31,11 +31,12 @@ class GoodsActivityController extends AdminController |
|
|
protected function grid() |
|
|
protected function grid() |
|
|
{ |
|
|
{ |
|
|
$marketId = Auth::getMarket(); |
|
|
$marketId = Auth::getMarket(); |
|
|
|
|
|
$build = new GoodsActivity(); |
|
|
if ($marketId){ |
|
|
if ($marketId){ |
|
|
$build = new \App\Models\v3\Goods(); |
|
|
|
|
|
|
|
|
//$build = new \App\Models\v3\Goods();
|
|
|
$build = $build::where('market_id',$marketId); |
|
|
$build = $build::where('market_id',$marketId); |
|
|
}else{ |
|
|
}else{ |
|
|
$build = new GoodsActivity(); |
|
|
|
|
|
|
|
|
//$build = new GoodsActivity();
|
|
|
} |
|
|
} |
|
|
return Grid::make($build, function (Grid $grid) { |
|
|
return Grid::make($build, function (Grid $grid) { |
|
|
// 二级分类
|
|
|
// 二级分类
|
|
|
|