diff --git a/_scripts/scrollTo.js b/_scripts/scrollTo.js index d8710f3fd5a9f6a54180361ab836be0974f9d483..410d9d4380bef8aae04d63735b2cdc68ef62af75 100644 --- a/_scripts/scrollTo.js +++ b/_scripts/scrollTo.js @@ -11,19 +11,28 @@ if(location.hash.indexOf('?')>-1) { if(surlp[0] === 'id') { - if(parseInt(window.pageYOffset) < window.document.getElementById(decodeURI(surlp[1])).offsetTop) + // console.log(parseInt(window.pageYOffset), window.document.getElementById(decodeURI(surlp[1])).offsetTop) + // console.log(parseInt(window.document.body.scrollHeight)-parseInt(window.document.body.clientHeight)) + + if(parseInt(window.pageYOffset)!==0 && parseInt(window.pageYOffset) < window.document.getElementById(decodeURI(surlp[1])).offsetTop) { var setT = setTimeout(function(){ location.reload(); if(parseInt(window.pageYOffset) >= window.document.getElementById(decodeURI(surlp[1])).offsetTop) clearTimeout(setT); },500); - // console.log(parseInt(window.pageYOffset), window.document.getElementById(decodeURI(surlp[1])).offsetTop) // console.log(parseInt(window.pageYOffset) < window.document.getElementById(decodeURI(surlp[1])).offsetTop) + console.log(parseInt(window.document.body.scrollHeight)-parseInt(window.document.body.clientHeight),parseInt(window.document.getElementById(decodeURI(surlp[1])).offsetTop)) + //页面全高-屏幕高度如果大于滚动栏高度,则清除滚动 + if(parseInt(window.document.body.scrollHeight)-parseInt(window.document.body.clientHeight)