diff --git a/openhis-ui-vue3/src/views/login.vue b/openhis-ui-vue3/src/views/login.vue index 0883b4f93..b2a0cd12f 100755 --- a/openhis-ui-vue3/src/views/login.vue +++ b/openhis-ui-vue3/src/views/login.vue @@ -254,7 +254,8 @@ function handleForgotPassword() { watch( route, (newRoute) => { - redirect.value = newRoute.query && newRoute.query.redirect; + const raw = newRoute.query && newRoute.query.redirect + redirect.value = raw && raw !== 'noRedirect' && raw !== 'noredirect' ? raw : '/index' }, { immediate: true } ); @@ -343,7 +344,7 @@ function handleLogin() { return acc; }, {}); if (env === 'development' || !loginForm.value.invokeYb) { - router.push({ path: redirect.value || '/', query: otherQueryParams }); + router.push({ path: redirect.value || '/index', query: otherQueryParams }); } else { signIng.value = true; userStore.getInfo(); @@ -491,7 +492,7 @@ async function signIn(mac, ip) { return acc; }, {}); userStore.removeRoles(); - router.push({ path: redirect.value || '/', query: otherQueryParams }); + router.push({ path: redirect.value || '/index', query: otherQueryParams }); console.log('签到成功:', response); } catch (error) { userStore.logOut();