修复首次鉴权跳转白屏并补齐登录表单回归
前端验证 / verify (push) Failing after 5m15s

This commit is contained in:
cieanyau committed 2026-11-06 03:55:12 +08:00
1 parent 216354cef1
commit 6e2c114474
2 files changed
+117 -22

No files matched your search

+11 -6
View File
@@ -4,7 +4,7 @@
* 路由放行与组件实际挂载同时受会话约束,防止重定向等待期间仍执行受保护页面请求。
*/
import { computed, onMounted, onBeforeUnmount } from "vue";
import { useRoute } from "#app";
import { useRouter } from "#app";
import { NuxtLayout, NuxtPage, NuxtRouteAnnouncer } from "#components";
import BuildUpdateNotice from "~/components/BuildUpdateNotice.vue";
import OperationToasts from "~/components/OperationToasts.vue";
@@ -13,18 +13,23 @@ import { t as useTheme } from "~/lib/useTheme.js";
import { isPublicShop, isAuthPage, isPublicRoute } from "~/utils/access.js";
const auth = useAuth();
const route = useRoute();
// 入口控制 NuxtPage 是否挂载,必须读取守卫已确认的路由;Nuxt useRoute 要等页面完成才同步,会形成循环等待。
const route = useRouter().currentRoute;
const theme = useTheme();
// 只为访客切换公开购买布局;登录后的同一路由继续使用会员中心布局。
const layout = computed(() =>
!auth.isLoggedIn && isPublicShop(route) ? "public-order" : route.meta.layout,
!auth.isLoggedIn && isPublicShop(route.value)
? "public-order"
: route.value.meta.layout,
);
// 中间件负责导航,入口负责禁止未授权组件树挂载,两者处理的是不同的生命周期阶段。
const canRenderRoute = computed(() => auth.isLoggedIn || isPublicRoute(route));
const canRenderRoute = computed(
() => auth.isLoggedIn || isPublicRoute(route.value),
);
// 账号切换时重新创建布局与页面,清除旧账号的局部状态;登录入口自身按路径区分。
const routeSessionKey = computed(() =>
isAuthPage(route.path) || route.path === "/home.htm"
? route.path
isAuthPage(route.value.path) || route.value.path === "/home.htm"
? route.value.path
: auth.token || "anonymous",
);
// 主题监听由入口统一注册和释放,避免每次页面导航重复绑定系统主题事件。