Merge branch 'dev' of gitee.com:fumk/open-repo_-portal into dev
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { createRouter, createWebHistory } from 'vue-router';
|
import {createRouter, createWebHistory} from 'vue-router';
|
||||||
|
|
||||||
import homeRouter from './config/home';
|
import homeRouter from './config/home';
|
||||||
import settingRouter from './config/setting';
|
import settingRouter from './config/setting';
|
||||||
@@ -8,7 +8,7 @@ import noticeRouter from './config/notice';
|
|||||||
import accountRouter from './config/account';
|
import accountRouter from './config/account';
|
||||||
import errorRouter from './config/error';
|
import errorRouter from './config/error';
|
||||||
|
|
||||||
export { injectRouter } from './interceptor';
|
export {injectRouter} from './interceptor';
|
||||||
|
|
||||||
export const router = createRouter({
|
export const router = createRouter({
|
||||||
history: createWebHistory(import.meta.env.BASE_URL),
|
history: createWebHistory(import.meta.env.BASE_URL),
|
||||||
@@ -20,7 +20,16 @@ export const router = createRouter({
|
|||||||
...settingRouter,
|
...settingRouter,
|
||||||
...userRouter,
|
...userRouter,
|
||||||
...errorRouter
|
...errorRouter
|
||||||
]
|
],
|
||||||
|
scrollBehavior(to, from, savedPosition) {
|
||||||
|
// 如果有保存的位置(点击浏览器后退按钮时),则恢复原位
|
||||||
|
if (savedPosition) {
|
||||||
|
return savedPosition;
|
||||||
|
} else {
|
||||||
|
// 否则滚动到页面最顶部
|
||||||
|
return {top: 0, behavior: 'smooth'}; // 'smooth' 开启平滑滚动,如果不想要动画设为 'auto'
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
Reference in New Issue
Block a user