diff --git a/src/pages/GamepassForm.vue b/src/pages/GamepassForm.vue index 1567279..738cd2e 100644 --- a/src/pages/GamepassForm.vue +++ b/src/pages/GamepassForm.vue @@ -312,7 +312,12 @@ async function refresh(): Promise { async function goBack(): Promise { disposed = true - await router.push({ path: '/login', query: { pick: '1' } }) + // "返回一般登入" — go back to the regular id-pass form within the + // same saved region, NOT to the region picker. Pushing + // `/login?pick=1` would force the user to re-pick TW/HK, which the + // button label does not promise. Mirrors WPF's + // `LoginMethod = Regular` + `loginMethodChanged()` flow. + await router.push('/login/id-pass') } diff --git a/src/pages/LoginRegionSelection.vue b/src/pages/LoginRegionSelection.vue index f7381ad..800b7f0 100644 --- a/src/pages/LoginRegionSelection.vue +++ b/src/pages/LoginRegionSelection.vue @@ -31,7 +31,7 @@ * picker without triggering the redirect again. */ -import { computed, onMounted, watch } from 'vue' +import { computed, watch } from 'vue' import { useI18n } from 'vue-i18n' import { useRoute, useRouter } from 'vue-router' import { useConfigStore } from '../stores/config' @@ -44,16 +44,6 @@ const route = useRoute() const router = useRouter() const config = useConfigStore() -/** - * Skip the region picker if a region is already saved — go - * straight to the login form. First-launch users see the picker. - */ -onMounted(() => { - if (config.get('loginRegion')) { - void router.replace('/login/id-pass') - } -}) - /** * Tile descriptors. Kept declarative so the template stays a flat * `v-for` rather than two near-duplicate `