From 0488b290f7aef99f8a2ce7d92aacf1501aaabf3f Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sun, 27 Apr 2025 15:01:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/element.scss | 6 +++--- src/assets/styles/main.scss | 8 ++++---- src/components/common/FTButton/index.vue | 16 ++++++++-------- src/layouts/default.vue | 4 +--- src/main.ts | 3 +-- vite.config.ts | 7 +++++++ 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/assets/styles/element.scss b/src/assets/styles/element.scss index 4f256b5..884d370 100644 --- a/src/assets/styles/element.scss +++ b/src/assets/styles/element.scss @@ -1,10 +1,10 @@ :root { - --el-font-size-base: 50px; - --el-button-size: 80px; + --el-font-size-base: 14px; + --el-button-size: 30px; - --el-color-primary: #26509C; + --el-color-primary: #1989FA; //--el-button-active-bg-color: linear-gradient(90deg, #0657C0 24%, #096AE0 101%); //--text-color-primary: #17213c; //--el-color-success: rgba(88, 162, 95, 1); diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index d8adc5e..6625593 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -1,7 +1,7 @@ -$primary-color: #0a57ea; -$success-color: #67c23a; -$danger-color: #f56c6c; -$warn-color: #e6a23c; +$primary-color: #1989FA; +$success-color: #14A656; +$danger-color: #DF1515; +$warn-color: #EE8223; $info-color: #909399; @use './common.scss'; diff --git a/src/components/common/FTButton/index.vue b/src/components/common/FTButton/index.vue index 8ccabb1..aa3c4ee 100644 --- a/src/components/common/FTButton/index.vue +++ b/src/components/common/FTButton/index.vue @@ -79,12 +79,12 @@ defineExpose({ } .my-button { height: var(--el-button-size); - padding: 0 50px; - border-radius: 10px; + padding: 0 20px; + border-radius: 5px; display: flex; align-items: center; cursor: pointer; - font-size: 40px; + font-size: 14px; width: fit-content; position: relative; .el-icon { @@ -99,14 +99,14 @@ defineExpose({ opacity: 0.5; } .my-button-default { - background: linear-gradient(180deg, #D8E3F8 0%, #FBFCFE 100%); - color: #26509C; - border: 1px solid #D8E3F8; + background: #fff; + color: $primary-color; + border: 1px solid $primary-color; } .my-button-primary { - background: linear-gradient(90deg, #0657C0 24%, #096AE0 101%); + background: $primary-color; color: #fff; - border: 1px solid #D8E3F8; + border: 1px solid $primary-color; } .my-button-info { diff --git a/src/layouts/default.vue b/src/layouts/default.vue index f7b901f..432a67c 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -17,9 +17,7 @@ const router = useRouter() -
- -
+
diff --git a/src/main.ts b/src/main.ts index e9f6e16..fd952e0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ -import * as ElementPlusIconsVue from '@element-plus/icons-vue' // 引入 ElementPlusIconsVue +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import FtButton from 'components/common/FTButton/index.vue' import FtDialog from 'components/common/FTDialog/index.vue' import FtStream from 'components/common/FTStream/index.vue' @@ -10,7 +10,6 @@ import { createApp } from 'vue' import App from './app.vue' import router from './router' import 'element-plus/dist/index.css' -import 'assets/styles/main.scss' const app = createApp(App) for (const [key, component] of Object.entries(ElementPlusIconsVue)) { diff --git a/vite.config.ts b/vite.config.ts index 1638dcc..2319096 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -81,6 +81,13 @@ export default defineConfig({ 'router': resolve(__dirname, 'src/router'), }, }, + css: { + preprocessorOptions: { + scss: { + additionalData: '@use "@/assets/styles/main.scss" as *;', + }, + }, + }, // 本地化配置 server: { open: true,