fix: 修改独立窗口样式
This commit is contained in:
@@ -89,64 +89,64 @@
|
||||
mode="pop"
|
||||
@success="handleLogin"
|
||||
/>
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-row :gutter="5" justify="space-between" style="width: 100%">-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnMobile')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.MOBILE)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnQRCode')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.QR_CODE)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnRegister')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.REGISTER)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>-->
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <div class="w-[100%] flex justify-between">-->
|
||||
<!-- <Icon-->
|
||||
<!-- v-for="(item, key) in socialList"-->
|
||||
<!-- :key="key"-->
|
||||
<!-- :icon="item.icon"-->
|
||||
<!-- :size="30"-->
|
||||
<!-- class="anticon cursor-pointer"-->
|
||||
<!-- color="#999"-->
|
||||
<!-- @click="doSocialLogin(item.type)"-->
|
||||
<!-- />-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-divider content-position="center">萌新必读</el-divider>-->
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <div class="w-[100%] flex justify-between">-->
|
||||
<!-- <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>-->
|
||||
<!-- <el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>-->
|
||||
<!-- <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">-->
|
||||
<!-- ⚡面试手册-->
|
||||
<!-- </el-link>-->
|
||||
<!-- <el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank">-->
|
||||
<!-- 🤝外包咨询-->
|
||||
<!-- </el-link>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-row :gutter="5" justify="space-between" style="width: 100%">-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnMobile')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.MOBILE)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnQRCode')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.QR_CODE)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <XButton-->
|
||||
<!-- :title="t('login.btnRegister')"-->
|
||||
<!-- class="w-[100%]"-->
|
||||
<!-- @click="setLoginState(LoginStateEnum.REGISTER)"-->
|
||||
<!-- />-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>-->
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <div class="w-[100%] flex justify-between">-->
|
||||
<!-- <Icon-->
|
||||
<!-- v-for="(item, key) in socialList"-->
|
||||
<!-- :key="key"-->
|
||||
<!-- :icon="item.icon"-->
|
||||
<!-- :size="30"-->
|
||||
<!-- class="anticon cursor-pointer"-->
|
||||
<!-- color="#999"-->
|
||||
<!-- @click="doSocialLogin(item.type)"-->
|
||||
<!-- />-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-divider content-position="center">萌新必读</el-divider>-->
|
||||
<!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <div class="w-[100%] flex justify-between">-->
|
||||
<!-- <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>-->
|
||||
<!-- <el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>-->
|
||||
<!-- <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">-->
|
||||
<!-- ⚡面试手册-->
|
||||
<!-- </el-link>-->
|
||||
<!-- <el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank">-->
|
||||
<!-- 🤝外包咨询-->
|
||||
<!-- </el-link>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
</el-row>
|
||||
</el-form>
|
||||
</template>
|
||||
@@ -275,14 +275,26 @@ const handleLogin = async (params: any) => {
|
||||
authUtil.removeLoginForm()
|
||||
}
|
||||
authUtil.setToken(res)
|
||||
if (!redirect.value) {
|
||||
redirect.value = '/'
|
||||
|
||||
// 登录成功后,确保跳转逻辑
|
||||
if (!redirect.value || redirect.value === '/') {
|
||||
redirect.value = '/dashboard' // 默认跳转到首页
|
||||
}
|
||||
|
||||
// 判断是否为SSO登录
|
||||
if (redirect.value.indexOf('sso') !== -1) {
|
||||
window.location.href = window.location.href.replace('/login?redirect=', '')
|
||||
} else {
|
||||
await push({ path: redirect.value || permissionStore.addRouters[0].path })
|
||||
// 强制跳转到首页,除非有特殊的重定向需求
|
||||
const targetPath =
|
||||
redirect.value === '/'
|
||||
? '/dashboard'
|
||||
: redirect.value === '/login'
|
||||
? '/dashboard'
|
||||
: redirect.value
|
||||
|
||||
console.log('Login redirect to:', targetPath) // 调试日志
|
||||
await push({ path: targetPath, replace: true })
|
||||
}
|
||||
} finally {
|
||||
loginLoading.value = false
|
||||
@@ -329,6 +341,7 @@ watch(
|
||||
() => currentRoute.value,
|
||||
(route: RouteLocationNormalizedLoaded) => {
|
||||
redirect.value = route?.query?.redirect as string
|
||||
console.log('LoginForm - route changed, redirect:', redirect.value) // 调试日志
|
||||
},
|
||||
{
|
||||
immediate: true
|
||||
|
||||
Reference in New Issue
Block a user