From adf3d87e5c3e399748cc820f89bcc530e99a592d Mon Sep 17 00:00:00 2001 From: xlsea Date: Thu, 19 Jun 2025 23:20:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?revert(projects):=20=E5=8D=95=E7=82=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=9B=9E=E8=B0=83=E9=A1=B5=E9=9D=A2=E5=9B=9E?= =?UTF-8?q?=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/typings/components.d.ts | 1 - src/views/_builtin/social-callback/index.vue | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index d34d6bfb..675dd470 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -34,7 +34,6 @@ declare module 'vue' { IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default'] IconIcRoundSearch: typeof import('~icons/ic/round-search')['default'] IconLocalBanner: typeof import('~icons/local/banner')['default'] - IconLocalLoginBg: typeof import('~icons/local/login-bg')['default'] IconLocalLogo: typeof import('~icons/local/logo')['default'] 'IconMaterialSymbols:add': typeof import('~icons/material-symbols/add')['default'] 'IconMaterialSymbols:deleteOutline': typeof import('~icons/material-symbols/delete-outline')['default'] diff --git a/src/views/_builtin/social-callback/index.vue b/src/views/_builtin/social-callback/index.vue index 61e4959e..69c0191d 100644 --- a/src/views/_builtin/social-callback/index.vue +++ b/src/views/_builtin/social-callback/index.vue @@ -43,7 +43,7 @@ const handleError = () => { msg.value = '登录失败，1s 后即将跳转至登录页'; }, 1000); setTimeout(() => { - // routerPushByKey('login'); + routerPushByKey('login'); }, 1000); }; @@ -116,7 +116,7 @@ const primaryColor = `--primary-color: ${r} ${g} ${b}`;
-

{{ $t('system.title') }}

+

{{ msg }}

From 907f04396921aa0f29d144d906496a008f751f59 Mon Sep 17 00:00:00 2001 From: xlsea Date: Thu, 19 Jun 2025 23:30:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?style(projects):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/theme/shared.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/store/modules/theme/shared.ts b/src/store/modules/theme/shared.ts index e980a799..8655d96d 100644 --- a/src/store/modules/theme/shared.ts +++ b/src/store/modules/theme/shared.ts @@ -252,6 +252,9 @@ export function getNaiveTheme(colors: App.Theme.ThemeColor, recommended = false) }, Tag: { borderRadius: '6px' + }, + Button: { + textColorPrimary: '#ffffff' } }; From 742e3858ab09bb75a35b8b833a5b266359e9815c Mon Sep 17 00:00:00 2001 From: xlsea Date: Thu, 19 Jun 2025 23:52:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat(styles):=20=E4=BF=AE=E5=A4=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/modules/global-header/index.vue | 4 ++-- src/views/_builtin/login/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue index 85995c26..786047b1 100644 --- a/src/layouts/modules/global-header/index.vue +++ b/src/layouts/modules/global-header/index.vue @@ -45,7 +45,7 @@ const tenantId = ref(authStore.userInfo?.user?.tenantId || '0
- + (authStore.userInfo?.user?.tenantId || '0 :is-dark="themeStore.darkMode" @switch="themeStore.toggleThemeScheme" /> - +
diff --git a/src/views/_builtin/login/index.vue b/src/views/_builtin/login/index.vue index 187b33dd..7c241612 100644 --- a/src/views/_builtin/login/index.vue +++ b/src/views/_builtin/login/index.vue @@ -39,8 +39,8 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']);