From 5d8211b3daaa82314e7181467f9e8438a3b98c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= Date: Thu, 20 Jun 2024 12:03:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/styles/var.scss | 27 +++++++++++++++++++++++++-- ui/dasadmin/vite.config.ts | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ui/dasadmin/src/styles/var.scss b/ui/dasadmin/src/styles/var.scss index d8d17c49..69446242 100644 --- a/ui/dasadmin/src/styles/var.scss +++ b/ui/dasadmin/src/styles/var.scss @@ -2,13 +2,36 @@ @use 'mixins' as *; $colors: ( ) !default; -$colors: map.deep-merge(('primary': ('base': #0064AA)), +$colors: map.deep-merge(('white': #ffffff, + 'black': #000000, + 'primary': ('base': red, + ), + 'success': ('base': #67c23a, + ), + 'warning': ('base': #e6a23c, + ), + 'danger': ('base': #f56c6c, + ), + 'error': ('base': #f56c6c, + ), + 'info': ('base': #909399, + ), + ), $colors ); +$color-white: map.get($colors, 'white') !default; +$color-black: map.get($colors, 'black') !default; +$color-primary: map.get($colors, 'primary', 'base') !default; +$color-success: map.get($colors, 'success', 'base') !default; +$color-warning: map.get($colors, 'warning', 'base') !default; +$color-danger: map.get($colors, 'danger', 'base') !default; +$color-error: map.get($colors, 'error', 'base') !default; +$color-info: map.get($colors, 'info', 'base') !default; + // 后台主体窗口左右间距 $main-space: 16px; -$primary-light: #3f6ad8; +$primary-light: #0064AA; // --ba-background $bg-color: ( diff --git a/ui/dasadmin/vite.config.ts b/ui/dasadmin/vite.config.ts index 4be68fc1..856f0d14 100644 --- a/ui/dasadmin/vite.config.ts +++ b/ui/dasadmin/vite.config.ts @@ -16,7 +16,7 @@ const viteConfig = ({ mode }: ConfigEnv): UserConfig => { const alias: Record = { '/@': pathResolve('./src/'), assets: pathResolve('./src/assets'), - 'vue-i18n': isProd(mode) ? 'vue-i18n/dist/vue-i18n.cjs.prod.js' : 'vue-i18n/dist/vue-i18n.cjs.js', + 'vue-i18n': isProd(mode) ? './vue-i18n/dist/vue-i18n.cjs.prod.js' : './vue-i18n/dist/vue-i18n.cjs.js', } const createProxy = (proxyList: any) => { From a38928427d90fdb498c6c7559a7a6e465f617a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= Date: Thu, 20 Jun 2024 12:05:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dasadmin/vite.config.ts b/ui/dasadmin/vite.config.ts index 856f0d14..4be68fc1 100644 --- a/ui/dasadmin/vite.config.ts +++ b/ui/dasadmin/vite.config.ts @@ -16,7 +16,7 @@ const viteConfig = ({ mode }: ConfigEnv): UserConfig => { const alias: Record = { '/@': pathResolve('./src/'), assets: pathResolve('./src/assets'), - 'vue-i18n': isProd(mode) ? './vue-i18n/dist/vue-i18n.cjs.prod.js' : './vue-i18n/dist/vue-i18n.cjs.js', + 'vue-i18n': isProd(mode) ? 'vue-i18n/dist/vue-i18n.cjs.prod.js' : 'vue-i18n/dist/vue-i18n.cjs.js', } const createProxy = (proxyList: any) => {