diff --git a/web-admin/src/api/auth.ts b/web-admin/src/api/auth.ts index d0b1186e..84bad4b9 100644 --- a/web-admin/src/api/auth.ts +++ b/web-admin/src/api/auth.ts @@ -29,6 +29,45 @@ export async function fetchLogin(params: { username: string; password: string }) }) } +export function fetchWxQrCreate() { + return request.post<{ + sessionId: string + expiresIn: number + qrImageBase64: string + }>({ + url: '/web/auth/wx-qr/create', + data: {}, + headers: { 'X-Api-Crypto': 'off' }, + showErrorMessage: true + }) +} + +export function fetchWxQrStatus(sessionId: string) { + return request.get<{ + status: string + message?: string + token?: string + refreshToken?: string + expiresIn?: number + userInfo?: { + id: string + username: string + realName: string + phone: string + role: string + roleNames?: string[] + regionId: string + regionName: string + avatarUrl?: string | null + } + }>({ + url: '/web/auth/wx-qr/status', + params: { sessionId }, + headers: { 'X-Api-Crypto': 'off' }, + showErrorMessage: false + }) +} + /** * 获取当前用户信息 * @returns 用户信息 diff --git a/web-admin/src/views/auth/login/index.vue b/web-admin/src/views/auth/login/index.vue index d26388d0..969324a2 100644 --- a/web-admin/src/views/auth/login/index.vue +++ b/web-admin/src/views/auth/login/index.vue @@ -31,10 +31,37 @@

欢迎登录

-

请输入您的账号信息

+

微信扫一扫,授权手机号后自动登录

+
+ +
+
+ 登录二维码 +
{{ qrStatus === 'creating' ? '生成中…' : '暂无二维码' }}
+
+

+ {{ qrStatusText }} +

+ + + 刷新二维码 + +
+ +
+ + +
+ 登 录 @@ -85,12 +113,12 @@