diff --git a/JavaScript/General/route.js b/JavaScript/General/route.js index 20d6396..7fafcd3 100644 --- a/JavaScript/General/route.js +++ b/JavaScript/General/route.js @@ -212,9 +212,13 @@ const routes = { }, "/travel": async () => { + window.myData.travel.isCountry = false; + window.myData.travel.isProvice = false; await routesFunction.travel(); }, "/travel/": async () => { + window.myData.travel.isCountry = false; + window.myData.travel.isProvice = false; await routesFunction.travel(); }, "/travel/:countryId": async ( @@ -223,13 +227,10 @@ const routes = { const { countryId } = params; - if (!myFunction.travelIsValid(countryId)) { - - if (countryId === "TW") { - await router.route("/travel/CN/TaiWan", true); - return; - } + if (!(await myFunction.travelIsValid(countryId))) { + window.myData.travel.isCountry = false; + window.myData.travel.isProvice = false; await myFunction.Page404(); return; } else { @@ -245,8 +246,10 @@ const routes = { ) => { const { countryId, proviceId } = params; - if (!myFunction.travelIsValid(countryId, proviceId)) { + if (!(await myFunction.travelIsValid(countryId, proviceId))) { + window.myData.travel.isCountry = false; + window.myData.travel.isProvice = false; await myFunction.Page404(); return; } else { diff --git a/spa.html b/spa.html index 177f9a0..e78690e 100644 --- a/spa.html +++ b/spa.html @@ -56,6 +56,15 @@ + + + +