diff --git a/app/Admin/Controllers/StoreController.php b/app/Admin/Controllers/StoreController.php index 98a939ba..9e6c8dec 100644 --- a/app/Admin/Controllers/StoreController.php +++ b/app/Admin/Controllers/StoreController.php @@ -43,6 +43,7 @@ class StoreController extends AdminController $grid->disableCreateButton(!$canAdmin); $grid->showEditButton(); $grid->showViewButton(); + $grid->showDeleteButton($canAdmin); $grid->filter(function (Grid\Filter $filter) { $filter->panel(); @@ -174,6 +175,14 @@ class StoreController extends AdminController $form->text('remarks'); $form->disableDeleteButton(); + + // 管理员删除店铺 + if ($form->isDeleting() && $canAdmin) { + $info = Store::find($form->getKey()); + // 删除店铺关联的数据 + $info->adminUsers()->detach(); + $info->productSkus()->detach(); + } }); } diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index 9ebdc7c1..8d6ba5b3 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -40,6 +40,7 @@ class AdminMenuSeeder extends Seeder 'icon' => 'fa fa-shopping-bag', 'uri' => '', 'children'=>[ + [ 'title' => '店铺管理', 'icon' => '', 'uri' => 'store' ], [ 'title' =>'文章管理', 'icon' => '', diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index 44fc680b..7c8ec78a 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -306,6 +306,10 @@ class AdminPermissionSeeder extends Seeder 'remark'=>['name' =>'备注'], ], ], + 'store' => [ + 'name' => '店铺管理', + 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + ] ]; // try { // DB::begintransaction(); diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php deleted file mode 100644 index de34b5bb..00000000 --- a/database/seeders/AdminSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ -call([ - // AdminMenuSeeder::class, - AdminPermissionSeeder::class, - ]); - } -} diff --git a/database/seeders/AdminUserSeeder.php b/database/seeders/AdminUserSeeder.php new file mode 100644 index 00000000..7c418972 --- /dev/null +++ b/database/seeders/AdminUserSeeder.php @@ -0,0 +1,32 @@ + 'Administrator', + 'slug' => 'administrator', + ]); + + $user = $userModel::create([ + 'username' => 'admin', + 'password' => 'admin', + 'name' => '管理员', + ]); + + $user->roles()->attach($role); + } +} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 25c50238..4313682f 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -15,9 +15,11 @@ class DatabaseSeeder extends Seeder public function run() { $this->call([ - AdminSeeder::class, + AdminMenuSeeder::class, + AdminPermissionSeeder::class, AppSettingSeeder::class, VipSeeder::class, + AdminUserSeeder::class, ]); if (! App::isProduction()) { diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index d93b71ab..bd5b0dc5 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -27,7 +27,7 @@ class UserSeeder extends Seeder DB::table('balances')->truncate(); DB::table('users')->truncate(); $this->faker = $this->withFaker(); - // $this->createUsers(1); + $this->createUsers(1); } protected function createUsers($vip, $parent = null)