diff --git a/admin/src/permission.ts b/admin/src/permission.ts index 11bdcaeb..346a911f 100644 --- a/admin/src/permission.ts +++ b/admin/src/permission.ts @@ -78,6 +78,5 @@ router.beforeEach(async (to, from, next) => { }) router.afterEach(() => { - console.log(router.getRoutes()) NProgress.done() }) diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index 8227b944..7b6d8926 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -84,8 +84,9 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine } } } - +//通过权限字符查询路由路径 export function getRoutePath(perms: string) { + console.log(router.getRoutes()) return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || '' } diff --git a/admin/src/styles/element.scss b/admin/src/styles/element.scss index e3f4a7e1..48c2c86d 100644 --- a/admin/src/styles/element.scss +++ b/admin/src/styles/element.scss @@ -112,6 +112,9 @@ .el-button--danger { --el-button-hover-link-text-color: var(--el-color-danger-light-3); } + .el-image__error { + font-size: 12px; + } } @media (max-width: 768px) { .el-pagination > .el-pagination__jump { diff --git a/admin/src/styles/var.css b/admin/src/styles/var.css index b9377057..a10631a3 100644 --- a/admin/src/styles/var.css +++ b/admin/src/styles/var.css @@ -32,7 +32,7 @@ --el-border-color-dark: #d4d7de; --el-border-color-darker: #cdd0d6; --el-fill-color: #f0f2f5; - --el-fill-color-light: #f5f7fa; + --el-fill-color-light: #f8f8f8; --el-fill-color-lighter: #fafafa; --el-fill-color-extra-light: #fafcff; --el-fill-color-dark: #ebedf0; diff --git a/admin/src/views/article/column/edit.vue b/admin/src/views/article/column/edit.vue index 3fd807ca..bdf9247f 100644 --- a/admin/src/views/article/column/edit.vue +++ b/admin/src/views/article/column/edit.vue @@ -12,9 +12,9 @@ - +
- +
默认为0, 数值越大越排前
diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue index 4f6661d8..21905173 100644 --- a/admin/src/views/decoration/tabbar.vue +++ b/admin/src/views/decoration/tabbar.vue @@ -111,12 +111,14 @@
diff --git a/admin/src/views/setting/search/index.vue b/admin/src/views/setting/search/index.vue index 1530b581..89471f4e 100644 --- a/admin/src/views/setting/search/index.vue +++ b/admin/src/views/setting/search/index.vue @@ -36,7 +36,7 @@ -