diff --git a/app/api/v1/users/users.py b/app/api/v1/users/users.py index 50807d1..bcc22e2 100644 --- a/app/api/v1/users/users.py +++ b/app/api/v1/users/users.py @@ -65,7 +65,6 @@ async def create_user( async def update_user( user_in: UserUpdate, ) -> BaseResponse: - print(user_in.dict()) user_controller = UserController() user = await user_controller.update(obj_in=user_in) await user_controller.update_roles(user, user_in.roles) diff --git a/app/core/init_app.py b/app/core/init_app.py index ef06eac..7c4822a 100644 --- a/app/core/init_app.py +++ b/app/core/init_app.py @@ -80,7 +80,7 @@ async def init_menus(): parent_menu = await Menu.create( menu_type=MenuType.CATALOG, name="系统管理", - path="/system", + path="system", order=1, parent_id=0, icon="carbon:gui-management", diff --git a/web/src/router/index.js b/web/src/router/index.js index 540e4f7..c8f225c 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -35,12 +35,11 @@ export async function addDynamicRoutes() { router.addRoute(EMPTY_ROUTE) return } - // 有token的情况 + const userStore = useUserStore() + const permissionStore = usePermissionStore() + !userStore.userId && (await userStore.getUserInfo()) try { - const userStore = useUserStore() - const permissionStore = usePermissionStore() - !userStore.userId && (await userStore.getUserInfo()) const accessRoutes = await permissionStore.generateRoutes() await permissionStore.getAccessApis() accessRoutes.forEach((route) => { @@ -49,6 +48,7 @@ export async function addDynamicRoutes() { router.hasRoute(EMPTY_ROUTE.name) && router.removeRoute(EMPTY_ROUTE.name) router.addRoute(NOT_FOUND_ROUTE) } catch (error) { + console.error('error', error) const userStore = useUserStore() await userStore.logout() } diff --git a/web/src/store/modules/permission/index.js b/web/src/store/modules/permission/index.js index 9eaee50..2e1ea37 100644 --- a/web/src/store/modules/permission/index.js +++ b/web/src/store/modules/permission/index.js @@ -8,7 +8,7 @@ import api from '@/api' function buildRoutes(routes = []) { return routes.map((e) => ({ name: e.name, - path: e.component !== 'Layout' ? '/' : e.path, // 处理目录是一级菜单的情况 + path: e.component !== 'Layout' ? '/' : '/' + e.path, // 处理目录是一级菜单的情况 component: shallowRef(Layout), // ? 不使用 shallowRef 控制台会有 warning isHidden: e.is_hidden, redirect: e.redirect, diff --git a/web/src/views/login/index.vue b/web/src/views/login/index.vue index 518ca31..1b7216f 100644 --- a/web/src/views/login/index.vue +++ b/web/src/views/login/index.vue @@ -54,7 +54,6 @@