diff --git a/src/lang/modules/enUS.ts b/src/lang/modules/enUS.ts index bd40c6e..7b08550 100644 --- a/src/lang/modules/enUS.ts +++ b/src/lang/modules/enUS.ts @@ -20,6 +20,9 @@ export default { ["third-menu-7"]: "third-menu-7", ["third-menu-8"]: "third-menu-8", ["third-menu-9"]: "third-menu-9", + ["personal-center"]: "personal center", + ["userinfo"]: "userinfo", + ["user-settings"]: "user settings", ["about-project"]: "about project", ["not-power"]: "No permission", ["not-found"]: "Page not found", @@ -44,6 +47,7 @@ export default { ["logout"]: "logout", ["notice"]: "Notice", ["message"]: "Message", - ["backlog"]: "Backlog" + ["backlog"]: "Backlog", + ["switch-language-to-preview"]: "Please switch the language to preview the internationalization effect" } }; diff --git a/src/lang/modules/zhCN.ts b/src/lang/modules/zhCN.ts index 1bed652..cd9a366 100644 --- a/src/lang/modules/zhCN.ts +++ b/src/lang/modules/zhCN.ts @@ -20,6 +20,9 @@ export default { ["third-menu-7"]: "三级菜单-7", ["third-menu-8"]: "三级菜单-8", ["third-menu-9"]: "三级菜单-9", + ["personal-center"]: "用户中心", + ["userinfo"]: "用户信息", + ["user-settings"]: "用户设置", ["about-project"]: "关于项目", ["not-power"]: "没有权限", ["not-found"]: "未找到页面", @@ -44,6 +47,7 @@ export default { ["logout"]: "退出登录", ["notice"]: "通知", ["message"]: "消息", - ["backlog"]: "待办" + ["backlog"]: "待办", + ["switch-language-to-preview"]: "请切换语言来预览国际化效果" } }; diff --git a/src/layout/components/Header/components/theme-settings/index.vue b/src/layout/components/Header/components/theme-settings/index.vue index 0beb381..0483ff0 100644 --- a/src/layout/components/Header/components/theme-settings/index.vue +++ b/src/layout/components/Header/components/theme-settings/index.vue @@ -136,6 +136,7 @@ const handleCancel = () => { align-items: center; justify-content: center; margin-bottom: $margin; + column-gap: $margin; } .layout-defaults, @@ -143,7 +144,6 @@ const handleCancel = () => { .layout-mixing { width: 70px; height: 50px; - margin-right: $margin; background: $color-fill-1; border-radius: $radius-box; overflow: hidden; diff --git a/src/layout/components/Logo/index.vue b/src/layout/components/Logo/index.vue index 713a8b9..7b8702d 100644 --- a/src/layout/components/Logo/index.vue +++ b/src/layout/components/Logo/index.vue @@ -1,7 +1,7 @@ @@ -12,6 +12,7 @@ import { useThemeConfig } from "@/store/modules/theme-config"; const themeStore = useThemeConfig(); const { collapsed, asideDark, layoutType } = storeToRefs(themeStore); +// 黑暗模式的文字渲染 const isDark = computed(() => { if (asideDark.value && layoutType.value != "layoutHead") { return true; @@ -19,6 +20,15 @@ const isDark = computed(() => { return false; } }); + +// 是否展示标题 +const isTitle = computed(() => { + if (!collapsed.value || layoutType.value == "layoutHead") { + return true; + } else { + return false; + } +}); diff --git a/src/router/route.ts b/src/router/route.ts index 65353d0..1b70f1e 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -239,6 +239,54 @@ export const dynamicRoutes: RouteRecordRaw[] = [ } ] }, + { + path: "/personal-center", + name: "personal-center", + meta: { + title: "personal-center", + link: "", + hide: false, + keepAlive: true, + affix: false, + iframe: false, + roles: ["admin"], + svgIcon: "user" + }, + children: [ + { + path: "/personal-center/userinfo", + name: "userinfo", + component: () => import("@/views/personal-center/userinfo/userinfo.vue"), + meta: { + title: "userinfo", + link: "", + hide: false, + keepAlive: true, + affix: false, + iframe: false, + roles: ["admin"], + icon: "icon-menu" + }, + children: [] + }, + { + path: "/personal-center/user-settings", + name: "user-settings", + component: () => import("@/views/personal-center/user-settings/user-settings.vue"), + meta: { + title: "user-settings", + link: "", + hide: false, + keepAlive: true, + affix: false, + iframe: false, + roles: ["admin"], + icon: "icon-menu" + }, + children: [] + } + ] + }, { path: "/internationalization", name: "internationalization", diff --git a/src/style/card-animation.scss b/src/style/card-animation.scss index 3b48d8b..b647212 100644 --- a/src/style/card-animation.scss +++ b/src/style/card-animation.scss @@ -9,6 +9,8 @@ } } +// 卡片过渡动画 +// 根据遍历的卡片数量应用动画，卡片数量支持20个 @for $i from 0 through 20 { .animated-fade-up-#{$i} { opacity: 0; // 初始透明度 diff --git a/src/style/media/layout.scss b/src/style/media/layout.scss index e1618e5..f9a322b 100644 --- a/src/style/media/layout.scss +++ b/src/style/media/layout.scss @@ -1,5 +1,6 @@ @import "./index.scss"; +// 处理首页数据图大小 // 页面宽度 大于 0px 小于 992px; @media screen and (min-width: $xs) and (max-width: $lg) { .sell-histogram { diff --git a/src/views/about-project/about-project.vue b/src/views/about-project/about-project.vue index 58c1110..7c7a4ef 100644 --- a/src/views/about-project/about-project.vue +++ b/src/views/about-project/about-project.vue @@ -1,5 +1,5 @@ diff --git a/src/views/internationalization/internationalization.vue b/src/views/internationalization/internationalization.vue index f2624de..09860df 100644 --- a/src/views/internationalization/internationalization.vue +++ b/src/views/internationalization/internationalization.vue @@ -1,7 +1,27 @@ diff --git a/src/views/multilevel-menu/second-menu/second-menu-1.vue b/src/views/multilevel-menu/second-menu/second-menu-1.vue index 13fe816..919e850 100644 --- a/src/views/multilevel-menu/second-menu/second-menu-1.vue +++ b/src/views/multilevel-menu/second-menu/second-menu-1.vue @@ -1,5 +1,5 @@