更新uniapp和platform
This commit is contained in:
1 parent
31ae07175d
commit
7f9a66da0f
47 files changed
+5207
-1974
No files matched your search
@@ -219,6 +219,25 @@ const cleanCaptchaInstance = () => {
|
||||
}
|
||||
};
|
||||
|
||||
// --- 登录成功后的统一收尾 ---
|
||||
// 重置动态路由加载状态并强制刷新菜单缓存:
|
||||
// 否则可能沿用上一次会话的「已加载」标记或他人账号的菜单缓存,
|
||||
// 导致业务路由没有按本次登录重建,跳转 /home 时命中 404。
|
||||
const afterLogin = async () => {
|
||||
try {
|
||||
const [{ useMenuStore }, { resetDynamicRoutes }] = await Promise.all([
|
||||
import("@/stores/menu"),
|
||||
import("@/router/index"),
|
||||
]);
|
||||
resetDynamicRoutes();
|
||||
await useMenuStore().refreshMenus();
|
||||
} catch (err) {
|
||||
// 菜单拉取失败不阻断登录,路由守卫会再次尝试加载
|
||||
console.warn("登录后刷新菜单失败:", err);
|
||||
}
|
||||
router.push({ path: "/home" });
|
||||
};
|
||||
|
||||
// --- 执行登录请求 ---
|
||||
const performLoginRequest = async () => {
|
||||
const res = await login({
|
||||
@@ -247,7 +266,7 @@ const performLoginRequest = async () => {
|
||||
const tabsStore = useTabsStore();
|
||||
tabsStore.resetTabs();
|
||||
|
||||
router.push({ path: "/home" });
|
||||
await afterLogin();
|
||||
ElMessage.success("登录成功!");
|
||||
return true;
|
||||
} else {
|
||||
@@ -368,7 +387,7 @@ const startGeetest4 = async () => {
|
||||
const { useTabsStore } = await import("@/stores");
|
||||
const tabsStore = useTabsStore();
|
||||
tabsStore.resetTabs();
|
||||
router.push({ path: "/home" });
|
||||
await afterLogin();
|
||||
ElMessage.success("登录成功!");
|
||||
} else {
|
||||
errorMsg.value = loginRes.msg || "登录失败";
|
||||
|
||||
Reference in new issue
Block a user