diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index 3ad23b27..fe7d04d5 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -53,6 +53,7 @@ class PermissionRepo ['title' => trans('admin/common.plugin'), 'permissions' => $this->getPluginPermissions()], ['title' => trans('admin/common.admin_user'), 'permissions' => $this->getAdminUserPermissions()], + ['title' => trans('admin/common.admin_role'), 'permissions' => $this->getAdminRolePermissions()], ['title' => trans('admin/common.region'), 'permissions' => $this->getRegionPermissions()], ['title' => trans('admin/common.tax_rate'), 'permissions' => $this->getTaxRatePermissions()], ['title' => trans('admin/common.tax_class'), 'permissions' => $this->getTaxClassPermissions()], @@ -219,6 +220,19 @@ class PermissionRepo } + /** + * 后台管理员权限列表 + * + * @return mixed + */ + private function getAdminRolePermissions() + { + $routes = ['admin_roles_index', 'admin_roles_create', 'admin_roles_show', 'admin_roles_update', 'admin_roles_delete']; + $items = $this->getPermissionList('role', $routes); + return hook_filter('role.role_permissions', $items); + } + + /** * 区域分组权限列表 * diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 1ad014fe..406a41de 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -196,7 +196,9 @@ Route::prefix($adminName) // 后台用户组 Route::middleware('can:admin_roles_index')->get('admin_roles', [Controllers\AdminRoleController::class, 'index'])->name('admin_roles.index'); + Route::middleware('can:admin_roles_create')->get('admin_roles/create', [Controllers\AdminRoleController::class, 'create'])->name('admin_roles.create'); Route::middleware('can:admin_roles_create')->post('admin_roles', [Controllers\AdminRoleController::class, 'store'])->name('admin_roles.store'); + Route::middleware('can:admin_roles_show')->get('admin_roles/{role_id}/edit', [Controllers\AdminRoleController::class, 'edit'])->name('admin_roles.edit'); Route::middleware('can:admin_roles_update')->put('admin_roles/{role_id}', [Controllers\AdminRoleController::class, 'update'])->name('admin_roles.update'); Route::middleware('can:admin_roles_delete')->delete('admin_roles/{role_id}', [Controllers\AdminRoleController::class, 'destroy'])->name('admin_roles.destroy'); }); diff --git a/resources/beike/admin/views/pages/admin_roles/index.blade.php b/resources/beike/admin/views/pages/admin_roles/index.blade.php index 4678ba07..d76471d5 100644 --- a/resources/beike/admin/views/pages/admin_roles/index.blade.php +++ b/resources/beike/admin/views/pages/admin_roles/index.blade.php @@ -65,4 +65,4 @@ }) }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index f1520e07..a040aaa4 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -31,6 +31,7 @@ return [ 'setting' => 'Settings', 'plugin' => 'Plugin', 'admin_user' => 'Admin User', + 'admin_role' => 'Admin Role', 'region' => 'Region', 'tax_rate' => 'Tax Rate', 'tax_class' => 'Tax Class', diff --git a/resources/lang/en/admin/role.php b/resources/lang/en/admin/role.php new file mode 100644 index 00000000..189f77ef --- /dev/null +++ b/resources/lang/en/admin/role.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'admin_roles_index' => 'Index', + 'admin_roles_create' => 'Create', + 'admin_roles_show' => 'Detail', + 'admin_roles_update' => 'Edit', + 'admin_roles_delete' => 'Delete' +]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index 800448ef..c8fa5fa5 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -31,6 +31,7 @@ return [ 'setting' => '系统设置', 'plugin' => '插件管理', 'admin_user' => '后台用户', + 'admin_role' => '用户角色', 'region' => '区域分组', 'tax_rate' => '税率管理', 'tax_class' => '税类管理', diff --git a/resources/lang/zh_cn/admin/role.php b/resources/lang/zh_cn/admin/role.php new file mode 100644 index 00000000..8a9cfd2f --- /dev/null +++ b/resources/lang/zh_cn/admin/role.php @@ -0,0 +1,18 @@ + + * @created 2022-08-02 19:03:19 + * @modified 2022-08-02 19:03:19 + */ + +return [ + 'admin_roles_index' => '角色列表', + 'admin_roles_create' => '创建角色', + 'admin_roles_show' => '角色详情', + 'admin_roles_update' => '更新角色', + 'admin_roles_delete' => '删除角色', +];