diff --git a/src/components/NotAllowed/index.vue b/src/components/NotAllowed/index.vue
index b82a2fac..6ec39a13 100755
--- a/src/components/NotAllowed/index.vue
+++ b/src/components/NotAllowed/index.vue
@@ -1,10 +1,14 @@
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index c077c346..23cdc559 100755
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -22,11 +22,7 @@ const settingsStore = useSettingsStore()
const title = ref(import.meta.env.VITE_APP_TITLE)
const logo = ref(imgLogo)
-const to = computed(() => {
- return {
- ...(settingsStore.settings.home.enable && { name: 'home' }),
- }
-})
+const to = computed(() => settingsStore.settings.home.enable ? settingsStore.settings.home.fullPath : '')
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index e496d198..71d5df84 100755
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -76,7 +76,8 @@ watch(() => userStore.avatar, () => {
+import useSettingsStore from '@/store/modules/settings'
+
const router = useRouter()
+const settingsStore = useSettingsStore()
+
const data = ref({
inter: Number.NaN,
countdown: 5,
@@ -29,7 +33,7 @@ onMounted(() => {
})
function goBack() {
- router.push('/')
+ router.push(settingsStore.settings.home.fullPath)
}
diff --git a/src/views/login.vue b/src/views/login.vue
index a82976ea..7ba2eccd 100755
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,6 +9,7 @@ meta:
import type { FormInstance, FormRules } from 'element-plus'
import { ElMessage } from 'element-plus'
import Copyright from '@/layouts/components/Copyright/index.vue'
+import useSettingsStore from '@/store/modules/settings'
import useUserStore from '@/store/modules/user'
defineOptions({
@@ -18,6 +19,7 @@ defineOptions({
const route = useRoute()
const router = useRouter()
+const settingsStore = useSettingsStore()
const userStore = useUserStore()
const banner = new URL('../assets/images/login-banner.png', import.meta.url).href
@@ -27,7 +29,7 @@ const title = import.meta.env.VITE_APP_TITLE
// 表单类型,login 登录,register 注册,reset 重置密码
const formType = ref('login')
const loading = ref(false)
-const redirect = ref(route.query.redirect?.toString() ?? '/')
+const redirect = ref(route.query.redirect?.toString() ?? settingsStore.settings.home.fullPath)
// 登录
const loginFormRef = ref()