From d06cd758303a4ff7108983ab8e1b3f6ac8796f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=9D=E5=8D=81?= <392706283@qq.com> Date: Thu, 8 Sep 2022 17:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4debugger=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9E=9A=E4=B8=BE=E4=B8=8E=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vben28/src/store/modules/user.ts | 1 - vben28/src/views/sys/login/Login.vue | 2 ++ vben28/src/views/sys/login/LoginForm.vue | 10 ++++++ vben28/src/views/sys/login/LoginFormTitle.vue | 2 +- vben28/src/views/sys/login/OidcSignIn.vue | 1 - .../views/sys/login/WorkWeChatQrCodeForm.vue | 31 +++++++++++++++++++ vben28/src/views/sys/login/useLogin.ts | 1 + 7 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 vben28/src/views/sys/login/WorkWeChatQrCodeForm.vue diff --git a/vben28/src/store/modules/user.ts b/vben28/src/store/modules/user.ts index 596ec090..b2af76dd 100644 --- a/vben28/src/store/modules/user.ts +++ b/vben28/src/store/modules/user.ts @@ -224,7 +224,6 @@ export const useUserStore = defineStore({ */ async logout(goLogin = false) { try { - debugger; if (this.userInfo?.isSts) { await useOidcLogout(); } else { diff --git a/vben28/src/views/sys/login/Login.vue b/vben28/src/views/sys/login/Login.vue index d6073dda..eef4f167 100644 --- a/vben28/src/views/sys/login/Login.vue +++ b/vben28/src/views/sys/login/Login.vue @@ -55,6 +55,7 @@ + @@ -71,6 +72,7 @@ import RegisterForm from './RegisterForm.vue'; import MobileForm from './MobileForm.vue'; import QrCodeForm from './QrCodeForm.vue'; + import WorkWeChatQrCodeForm from './WorkWeChatQrCodeForm.vue'; import TenantLoginForm from './TenantLoginForm.vue'; import { useGlobSetting } from '/@/hooks/setting'; import { useI18n } from '/@/hooks/web/useI18n'; diff --git a/vben28/src/views/sys/login/LoginForm.vue b/vben28/src/views/sys/login/LoginForm.vue index 52cec808..1b0de8e8 100644 --- a/vben28/src/views/sys/login/LoginForm.vue +++ b/vben28/src/views/sys/login/LoginForm.vue @@ -40,7 +40,13 @@ + {{ t('sys.login.otherSignIn') }} +
+ + +
diff --git a/vben28/src/views/sys/login/useLogin.ts b/vben28/src/views/sys/login/useLogin.ts index 8c1e20fe..8bb24293 100644 --- a/vben28/src/views/sys/login/useLogin.ts +++ b/vben28/src/views/sys/login/useLogin.ts @@ -11,6 +11,7 @@ export enum LoginStateEnum { MOBILE, QR_CODE, TENANT, + WORKWECHAT_QR_CODE, } const currentState = ref(LoginStateEnum.LOGIN);