diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 10f67c5..a4feea9 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -7,6 +7,8 @@ export interface SmsCodeVO {
scene: number
}
+
+
export interface SmsLoginVO {
mobile: string
code: string
@@ -72,10 +74,19 @@ export const socialAuthRedirect = (type: number, redirectUri: string) => {
}
// 获取验证图片以及 token
export const getCode = (data: any) => {
- debugger
return request.postOriginal({ url: 'system/captcha/get', data })
}
+// 获取登陆图片
+export const getCodeWebPic = (data: any) => {
+ return request.post({ url: 'system/auth/web_code_login', data })
+}
+
+// 根据扫码生产的uuuid 进行登陆
+export const qrLoginCode = (data: any) => {
+ return request.post({ url: 'system/auth/social-qr-login-openid', data })
+}
+
// 滑动或者点选验证
export const reqCheck = (data: any) => {
return request.postOriginal({ url: 'system/captcha/check', data })
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index b2ff380..d101085 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -51,8 +51,7 @@
>
-
-
+
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 193f478..b08d1e9 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -92,13 +92,13 @@
-
+
- {{ t('login.otherLogin') }}
+
+
diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue
index 2670d00..9e5d625 100644
--- a/src/views/Login/components/QrCodeForm.vue
+++ b/src/views/Login/components/QrCodeForm.vue
@@ -5,7 +5,10 @@
-
+
+
+
+
{{ t('login.qrcode') }}
@@ -18,13 +21,81 @@