|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div class="container p-20px">
|
|
|
+ <div class="container p-20px h-100% w-100%">
|
|
|
<div class="logo"></div>
|
|
|
<!-- 登录区域 -->
|
|
|
<div class="content">
|
|
@@ -203,9 +203,17 @@ const socialLogin = async () => {
|
|
|
type.value = route?.query?.type as number
|
|
|
code.value = route?.query?.code as string
|
|
|
state.value = route?.query?.state as string
|
|
|
+
|
|
|
if (!type.value) {
|
|
|
type.value = 20
|
|
|
}
|
|
|
+ let obj = {
|
|
|
+ socialCode: code.value,
|
|
|
+ socialState: state.value,
|
|
|
+ socialType: type.value
|
|
|
+ }
|
|
|
+ loginData.loginForm = Object.assign(loginData.loginForm, obj)
|
|
|
+
|
|
|
// 尝试登录一下
|
|
|
loginLoading.value = true
|
|
|
try {
|
|
@@ -230,7 +238,8 @@ const socialLogin = async () => {
|
|
|
if (redirect.value.indexOf('sso') !== -1) {
|
|
|
window.location.href = window.location.href.replace('/login?redirect=', '')
|
|
|
} else {
|
|
|
- push({ path: redirect.value || permissionStore.addRouters[0].path })
|
|
|
+ // push({ path: redirect.value || permissionStore.addRouters[0].path })
|
|
|
+ window.parent.pushWin() //触发iframe父页面的方法
|
|
|
}
|
|
|
} finally {
|
|
|
loginLoading.value = false
|