From a13d43c802669a5e14a4ffd38fba75622920964f Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Sat, 21 Nov 2020 20:35:06 +0800 Subject: [PATCH] fix(cli): fix anchor --- packages/vant-cli/package.json | 2 +- packages/vant-cli/site/desktop/App.vue | 8 +++++--- packages/vant-cli/site/desktop/utils.js | 2 +- packages/vant-cli/yarn.lock | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index a44e89bd8..08ca90d47 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -48,7 +48,7 @@ "@types/jest": "^26.0.0", "@types/webpack-dev-server": "^3.11.0", "@vant/eslint-config": "^3.0.0", - "@vant/markdown-loader": "^3.0.0", + "@vant/markdown-loader": "^3.0.1", "@vant/markdown-vetur": "^2.0.2", "@vant/stylelint-config": "^1.3.0", "@vant/touch-emulator": "^1.2.0", diff --git a/packages/vant-cli/site/desktop/App.vue b/packages/vant-cli/site/desktop/App.vue index 267d95f23..f507c0fb5 100644 --- a/packages/vant-cli/site/desktop/App.vue +++ b/packages/vant-cli/site/desktop/App.vue @@ -88,9 +88,11 @@ export default { }, mounted() { - if (this.$route.hash) { - scrollToAnchor(this.$route.hash); - } + setTimeout(() => { + if (this.$route.query.anchor) { + scrollToAnchor(this.$route.query.anchor); + } + }); }, methods: { diff --git a/packages/vant-cli/site/desktop/utils.js b/packages/vant-cli/site/desktop/utils.js index 085afa72f..ad9ed4ee9 100644 --- a/packages/vant-cli/site/desktop/utils.js +++ b/packages/vant-cli/site/desktop/utils.js @@ -2,7 +2,7 @@ export function scrollToAnchor(selector) { let count = 0; const timer = setInterval(() => { - const el = document.querySelector(selector); + const el = document.querySelector('#' + selector); if (el) { el.scrollIntoView(); clearInterval(timer); diff --git a/packages/vant-cli/yarn.lock b/packages/vant-cli/yarn.lock index 596c9452a..5f62afe58 100644 --- a/packages/vant-cli/yarn.lock +++ b/packages/vant-cli/yarn.lock @@ -2000,10 +2000,10 @@ eslint-plugin-import "^2.22.1" eslint-plugin-vue "^7.1.0" -"@vant/markdown-loader@^3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@vant/markdown-loader/-/markdown-loader-3.0.0.tgz#a189fbf75e0152ec16f82f8dafb918cd9c11d90a" - integrity sha512-p7i9yAILiRqV6w6Avburo4w7+pYwPXes22HbA/vMisbUzRmapKwx9kJiITIo17pK6Gx/57Oyp8mQ3Co5r2r0sg== +"@vant/markdown-loader@^3.0.1": + version "3.0.1" + resolved "https://registry.npm.taobao.org/@vant/markdown-loader/download/@vant/markdown-loader-3.0.1.tgz?cache=0&sync_timestamp=1605962030781&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vant%2Fmarkdown-loader%2Fdownload%2F%40vant%2Fmarkdown-loader-3.0.1.tgz#add005ce58b6f62c3567df168d42a502731fdecb" + integrity sha1-rdAFzli29iw1Z98WjUKlAnMf3ss= dependencies: front-matter "^4.0.2" highlight.js "^10.3.1"