xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ai-hub' into ai-hub

Browse Source
This commit is contained in:
chenchun
2025-07-28 13:15:49 +08:00
parent e1d3ec21e5 f45283dade
commit 1986901031
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Yi.Ai.Vue3/src/components/LoginDialog/index.vue
View File

@@ -85,10 +85,12 @@ function handleThirdPartyLogin(type: any) {
const resUserInfo = await getUserInfo(); const resUserInfo = await getUserInfo();
userStore.setUserInfo(resUserInfo.data); userStore.setUserInfo(resUserInfo.data);
// 关闭弹窗 // 关闭弹窗
if (popup && !popup.closed)
popup.close();
// 后续逻辑 // 后续逻辑
ElMessage.success('登录成功'); ElMessage.success('登录成功');
if (popup && !popup.closed) {
popup.close();
}
userStore.closeLoginDialog(); userStore.closeLoginDialog();
await sessionStore.requestSessionList(1, true); await sessionStore.requestSessionList(1, true);
await router.replace('/'); await router.replace('/');
@@ -105,14 +107,14 @@ function handleThirdPartyLogin(type: any) {
window.addEventListener('message', messageHandler); window.addEventListener('message', messageHandler);
// 超时自动清理 // 超时自动清理
setTimeout(() => { // setTimeout(() => {
if (!isHandled) { // if (!isHandled) {
window.removeEventListener('message', messageHandler); // window.removeEventListener('message', messageHandler);
if (popup && !popup.closed) // if (popup && !popup.closed)
popup.close(); // popup.close();
ElMessage.warning('登录超时'); // ElMessage.warning('登录超时');
} // }
}, 60 * 1000); // 60分钟超时关闭 // }, 60 * 1000); // 60分钟超时关闭
} }
// 让意社区重新登录，先让意社区退出登录，再重新登录 // 让意社区重新登录，先让意社区退出登录，再重新登录
@@ -161,14 +163,14 @@ function handleLoginAgainYi() {
window.addEventListener('message', messageHandler); window.addEventListener('message', messageHandler);
// 超时自动清理 // 超时自动清理
setTimeout(() => { // setTimeout(() => {
if (!isHandled) { // if (!isHandled) {
window.removeEventListener('message', messageHandler); // window.removeEventListener('message', messageHandler);
if (popup && !popup.closed) // if (popup && !popup.closed)
popup.close(); // popup.close();
ElMessage.warning('登录超时'); // ElMessage.warning('登录超时');
} // }
}, 60 * 1000); // 60分钟超时关闭 // }, 60 * 1000); // 60分钟超时关闭
} }
const wxSrc = computed( const wxSrc = computed(