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);