diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue index c54130bda..7da0b7c79 100644 --- a/frontend/src/layout/index.vue +++ b/frontend/src/layout/index.vue @@ -100,6 +100,10 @@ const resetSetting = () => { const loadProductProFromDB = async () => { const res = await getLicense(); + if (!res.data) { + globalStore.isProductPro = false; + return; + } globalStore.isProductPro = res.data.status === 'Enable' || res.data.status === 'Lost01' || res.data.status === 'Lost02'; diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index 6959fec84..aa6683783 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -13,7 +13,7 @@ router.beforeEach((to, from, next) => { if (to.name !== 'entrance' && !globalStore.isLogin) { next({ name: 'entrance', - params: to.params, + params: { code: to.params?.code || globalStore.entrance }, }); NProgress.done(); return; diff --git a/frontend/src/views/login/entrance/index.vue b/frontend/src/views/login/entrance/index.vue index 4e3da172e..9a8350f96 100644 --- a/frontend/src/views/login/entrance/index.vue +++ b/frontend/src/views/login/entrance/index.vue @@ -60,7 +60,6 @@ const loading = ref(); const mySafetyCode = defineProps({ code: { type: String, - required: true, default: '', }, }); @@ -94,10 +93,18 @@ const getStatus = async () => { errStatus.value = ''; loading.value = false; }) - .catch(() => { - pageCode.value = '200'; - errStatus.value = 'err-unsafe'; + .catch((errRes) => { + pageCode.value = pageCode.value || '200'; loading.value = false; + if (errRes?.code === 408) { + errStatus.value = 'err-ip'; + return; + } + if (errRes?.code === 409) { + errStatus.value = 'err-domain'; + return; + } + errStatus.value = 'err-unsafe'; }); }) .catch(() => {