|
@@ -290,7 +290,7 @@ router.beforeEach(async (to, from, next) => {
|
|
|
// 注意:这里假设 to.name 是可靠的,否则建议也用 path 映射
|
|
// 注意:这里假设 to.name 是可靠的,否则建议也用 path 映射
|
|
|
const isEnteringWhitelist =
|
|
const isEnteringWhitelist =
|
|
|
(from.path === PATHS.TRACKING_HOME && [PAGE_NAMES.BOOKING_DETAIL, PAGE_NAMES.TRACKING_DETAIL, PAGE_NAMES.ADD_VGM].includes(to.name)) ||
|
|
(from.path === PATHS.TRACKING_HOME && [PAGE_NAMES.BOOKING_DETAIL, PAGE_NAMES.TRACKING_DETAIL, PAGE_NAMES.ADD_VGM].includes(to.name)) ||
|
|
|
- (from.path === PATHS.BOOKING_HOME && [PAGE_NAMES.BOOKING_DETAIL, PAGE_NAMES.TRACKING_DETAIL].includes(to.name));
|
|
|
|
|
|
|
+ (from.path === PATHS.BOOKING_HOME && [PAGE_NAMES.BOOKING_DETAIL, PAGE_NAMES.TRACKING_DETAIL].includes(to.name)) || from.path === '';
|
|
|
|
|
|
|
|
// --- 最终逻辑 ---
|
|
// --- 最终逻辑 ---
|
|
|
// 如果满足上述任一“保留”场景,则 NOT 清除 (返回 false)
|
|
// 如果满足上述任一“保留”场景,则 NOT 清除 (返回 false)
|
|
@@ -304,8 +304,6 @@ router.beforeEach(async (to, from, next) => {
|
|
|
if (SHOULD_CLEAR_FILTERS(to, from)) {
|
|
if (SHOULD_CLEAR_FILTERS(to, from)) {
|
|
|
const filtersListStore = useFiltersStore();
|
|
const filtersListStore = useFiltersStore();
|
|
|
filtersListStore.clearFilters();
|
|
filtersListStore.clearFilters();
|
|
|
- // 可选:添加日志方便调试
|
|
|
|
|
- // console.log('Filters cleared because navigation was not in a protected flow.');
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|