diff --git a/.gitignore b/.gitignore index ff712e7..d3b01e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /node_modules /public/hot /public/storage +/public/vendors /storage/*.key /vendor .env diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index a2ddfcb..7c016f3 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -4,6 +4,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\ImsCjdcMarket; use App\Models\LanzuMmInfo; +use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -20,6 +21,11 @@ class ImsCjdcMarketController extends AdminController protected function grid() { return Grid::make(new ImsCjdcMarket(), function (Grid $grid) { + $adu = Admin::user(); + if ($adu->isRole('lanzu_mp')){ + $mp = LanzuMpInfo::where('admin_user_id',$adu->id)->first(); + $grid->model()->where('mp_id',$mp->id); + } $grid->id->sortable(); $grid->logo->image('', 50, 50); $grid->name; @@ -157,7 +163,7 @@ class ImsCjdcMarketController extends AdminController $form->textarea('introduce'); $form->textarea('remark'); $form->textarea('dishes_menu_intro')->value('菜谱简介'); - + $form->saving(function (Form $form){ if ($form->isCreating()){ $coordinates = explode(',',$form->coordinates);