|
|
@ -102,9 +102,18 @@ function loadPage(route, scrollPosition = 0) {
|
|
|
|
if (route.path === pendingPath) {
|
|
|
|
if (route.path === pendingPath) {
|
|
|
|
route.contentComponent = m.default
|
|
|
|
route.contentComponent = m.default
|
|
|
|
route.pageData = m.__pageData
|
|
|
|
route.pageData = m.__pageData
|
|
|
|
|
|
|
|
|
|
|
|
console.log(route.pageData)
|
|
|
|
|
|
|
|
await nextTick()
|
|
|
|
await nextTick()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (location.hash && !scrollPosition) {
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* @type {HTMLElement | null}
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
const target = document.querySelector(location.hash)
|
|
|
|
|
|
|
|
if (target) {
|
|
|
|
|
|
|
|
scrollPosition = target.offsetTop
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
window.scrollTo({
|
|
|
|
window.scrollTo({
|
|
|
|
left: 0,
|
|
|
|
left: 0,
|
|
|
|
top: scrollPosition,
|
|
|
|
top: scrollPosition,
|
|
|
|