From d6a358e8516abda7df20cbd098587d1c463a4caf Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Tue, 7 Dec 2021 14:27:08 +0800 Subject: [PATCH] fix: color name --- src/layout/components/setting/index.vue | 18 +++++++++--------- src/layout/theme/auroraGreen-vars.scss | 2 +- src/layout/theme/default-vars.scss | 2 +- src/layout/theme/dusk-vars.scss | 2 +- src/layout/theme/light-vars.scss | 2 +- src/layout/theme/mingQing-vars.scss | 2 +- src/layout/theme/pink-vars.scss | 2 +- src/layout/theme/saucePurple-vars.scss | 2 +- src/layout/theme/volcano-vars.scss | 2 +- src/layout/theme/yellow-vars.scss | 2 +- src/router/index.ts | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index dffdc64ce..79a02b437 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -29,23 +29,23 @@ const instanceConfig = getCurrentInstance().appContext.app.config.globalProperties.$config; let themeColors = ref>([ - // 暗雅(默认) + // 道奇蓝(默认) { rgb: "27, 42, 71", themeColor: "default" }, - // 明亮 + // 亮白色 { rgb: "255, 255, 255", themeColor: "light" }, - // 薄暮 + // 猩红色 { rgb: "245, 34, 45", themeColor: "dusk" }, - // 火山 + // 橙红色 { rgb: "250, 84, 28", themeColor: "volcano" }, - // 黄色 + // 金色 { rgb: "250, 219, 20", themeColor: "yellow" }, - // 明青 + // 绿宝石 { rgb: "19, 194, 194", themeColor: "mingQing" }, - // 极光绿 + // 酸橙绿 { rgb: "82, 196, 26", themeColor: "auroraGreen" }, - // 粉红 + // 深粉色 { rgb: "235, 47, 150", themeColor: "pink" }, - // 酱紫 + // 深紫罗兰色 { rgb: "114, 46, 209", themeColor: "saucePurple" } ]); diff --git a/src/layout/theme/auroraGreen-vars.scss b/src/layout/theme/auroraGreen-vars.scss index 2fcea09b9..af1f6ce4a 100644 --- a/src/layout/theme/auroraGreen-vars.scss +++ b/src/layout/theme/auroraGreen-vars.scss @@ -1,4 +1,4 @@ -/* 极光绿 */ +/* 酸橙绿 */ $subMenuActiveText: #fff; $menuBg: #0b1e15; $menuHover: #60ac80; diff --git a/src/layout/theme/default-vars.scss b/src/layout/theme/default-vars.scss index 8b2fd4ae5..def418f43 100644 --- a/src/layout/theme/default-vars.scss +++ b/src/layout/theme/default-vars.scss @@ -1,5 +1,5 @@ /** - * 暗雅(默认) + * 道奇蓝(默认) * 此scss变量文件作为multipleScopeVars去编译时,会自动移除!default以达到变量提升 * 同时此scss变量文件作为默认主题变量文件,被其他.scss通过 @import 时,必需 !default */ diff --git a/src/layout/theme/dusk-vars.scss b/src/layout/theme/dusk-vars.scss index bb34fee9e..61add2573 100644 --- a/src/layout/theme/dusk-vars.scss +++ b/src/layout/theme/dusk-vars.scss @@ -1,4 +1,4 @@ -/* 薄暮 */ +/* 猩红色 */ $subMenuActiveText: #fff; $menuBg: #2a0608; $menuHover: #e13c39; diff --git a/src/layout/theme/light-vars.scss b/src/layout/theme/light-vars.scss index f83a0841b..b33aa013a 100644 --- a/src/layout/theme/light-vars.scss +++ b/src/layout/theme/light-vars.scss @@ -1,4 +1,4 @@ -/* 明亮 */ +/* 亮白色 */ $subMenuActiveText: #409eff; $menuBg: #fff; $menuHover: #e0ebf6; diff --git a/src/layout/theme/mingQing-vars.scss b/src/layout/theme/mingQing-vars.scss index 8b8b0afe9..59ead9f1a 100644 --- a/src/layout/theme/mingQing-vars.scss +++ b/src/layout/theme/mingQing-vars.scss @@ -1,4 +1,4 @@ -/* 明青 */ +/* 绿宝石 */ $subMenuActiveText: #fff; $menuBg: #032121; $menuHover: #59bfc1; diff --git a/src/layout/theme/pink-vars.scss b/src/layout/theme/pink-vars.scss index 6a0403cc4..3d39a3a02 100644 --- a/src/layout/theme/pink-vars.scss +++ b/src/layout/theme/pink-vars.scss @@ -1,4 +1,4 @@ -/* 粉红 */ +/* 深粉色 */ $subMenuActiveText: #fff; $menuBg: #28081a; $menuHover: #d84493; diff --git a/src/layout/theme/saucePurple-vars.scss b/src/layout/theme/saucePurple-vars.scss index 9bb55d15c..0ead258a4 100644 --- a/src/layout/theme/saucePurple-vars.scss +++ b/src/layout/theme/saucePurple-vars.scss @@ -1,4 +1,4 @@ -/* 酱紫 */ +/* 深紫罗兰色 */ $subMenuActiveText: #fff; $menuBg: #130824; $menuHover: #693ac9; diff --git a/src/layout/theme/volcano-vars.scss b/src/layout/theme/volcano-vars.scss index aea4d33d5..6856feacd 100644 --- a/src/layout/theme/volcano-vars.scss +++ b/src/layout/theme/volcano-vars.scss @@ -1,4 +1,4 @@ -/* 火山 */ +/* 橙红色 */ $subMenuActiveText: #fff; $menuBg: #2b0e05; $menuHover: #e85f33; diff --git a/src/layout/theme/yellow-vars.scss b/src/layout/theme/yellow-vars.scss index a0fe225cd..49af3de29 100644 --- a/src/layout/theme/yellow-vars.scss +++ b/src/layout/theme/yellow-vars.scss @@ -1,4 +1,4 @@ -/* 橘黄 */ +/* 金色 */ $subMenuActiveText: #d25f00; $menuBg: #2b2503; $menuHover: #f6da4d; diff --git a/src/router/index.ts b/src/router/index.ts index edfde8a78..be3fd0d03 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -12,6 +12,7 @@ import NProgress from "/@/utils/progress"; import { split, uniqBy } from "lodash-es"; import { useTimeoutFn } from "@vueuse/core"; import { RouteConfigs } from "/@/layout/types"; +import { transformI18n } from "/@/plugins/i18n"; import { storageSession, storageLocal } from "/@/utils/storage"; import { usePermissionStoreHook } from "/@/store/modules/permission"; import { useMultiTagsStoreHook } from "/@/store/modules/multiTags"; @@ -30,7 +31,6 @@ import componentsRouter from "./modules/components"; // 动态路由 import { getAsyncRoutes } from "/@/api/routes"; -import { transformI18n } from "/@/plugins/i18n"; // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/*/*/*.vue");