Merge remote-tracking branch 'origin/ai-hub' into ai-hub
This commit is contained in:
@@ -85,12 +85,12 @@ function handleThirdPartyLogin(type: any) {
|
|||||||
const resUserInfo = await getUserInfo();
|
const resUserInfo = await getUserInfo();
|
||||||
userStore.setUserInfo(resUserInfo.data);
|
userStore.setUserInfo(resUserInfo.data);
|
||||||
// 关闭弹窗
|
// 关闭弹窗
|
||||||
|
|
||||||
// 后续逻辑
|
|
||||||
ElMessage.success('登录成功');
|
|
||||||
if (popup && !popup.closed) {
|
if (popup && !popup.closed) {
|
||||||
popup.close();
|
popup.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 后续逻辑
|
||||||
|
ElMessage.success('登录成功');
|
||||||
userStore.closeLoginDialog();
|
userStore.closeLoginDialog();
|
||||||
await sessionStore.requestSessionList(1, true);
|
await sessionStore.requestSessionList(1, true);
|
||||||
await router.replace('/');
|
await router.replace('/');
|
||||||
|
|||||||
@@ -16,6 +16,11 @@ const designStore = useDesignStore();
|
|||||||
// const { isMobile } = useScreenStore();
|
// const { isMobile } = useScreenStore();
|
||||||
/** 获取布局格式 */
|
/** 获取布局格式 */
|
||||||
const layout = computed((): LayoutType => designStore.layout);
|
const layout = computed((): LayoutType => designStore.layout);
|
||||||
|
onMounted(() => {
|
||||||
|
console.log('111--');
|
||||||
|
// 通知 index.html 的 loading 动画进度拉满并淡出
|
||||||
|
(window as any)?.finishLoading();
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@@ -29,6 +29,3 @@ app.use(store);
|
|||||||
// 挂载 Vue 应用
|
// 挂载 Vue 应用
|
||||||
// mount 完成说明应用初始化完毕,此时手动通知 loading 动画结束
|
// mount 完成说明应用初始化完毕,此时手动通知 loading 动画结束
|
||||||
app.mount('#app');
|
app.mount('#app');
|
||||||
|
|
||||||
// 通知 index.html 的 loading 动画进度拉满并淡出
|
|
||||||
(window as any).finishLoading?.();
|
|
||||||
|
|||||||
Reference in New Issue
Block a user