Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(taro-h5): 修复pageScrollTo方法滚动的实际位置与给定的目标位置不符 #6059

Merged
merged 7 commits into from
Jul 31, 2020
Merged

fix(taro-h5): 修复pageScrollTo方法滚动的实际位置与给定的目标位置不符 #6059

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71743aa
fix(taro-h5): 修复pageScrollTo方法滚动的实际位置与给定的目标位置不符
GoodbyeNJN Apr 21, 2020
30900b1
fix(taro-h5): 修复pageScrollTo方法滚动的实际位置与给定的目标位置不符
GoodbyeNJN Apr 26, 2020
89c2dc3
fix(taro-h5): 修复pageScrollTo方法滚动的实际位置与给定的目标位置不符
GoodbyeNJN May 25, 2020
c18ce11
Merge branch '2.x' into 2.x
GoodbyeNJN May 25, 2020
b16e33b
Merge branch '2.x' into 2.x
GoodbyeNJN Jun 6, 2020
71c4ed8
Merge branch '2.x' into 2.x
luckyadam Jul 30, 2020
2d13163
Merge branch '2.x' into 2.x
ZakaryCode Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/taro-h5/src/api/scroll/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const pageScrollTo = ({ scrollTop, duration = 300, success, fail, complet
const to = scrollTop
const delta = to - from

const frameCnt = duration / FRAME_DURATION
const frameCnt = duration / FRAME_DURATION - 1
const easeFunc = getTimingFunc(easeInOut, frameCnt)

const scroll = (frame = 0) => {
Expand All @@ -64,6 +64,7 @@ export const pageScrollTo = ({ scrollTop, duration = 300, success, fail, complet
const res = {
errMsg: 'pageScrollTo:ok'
}
scrollFunc(to)
success && success(res)
complete && complete(res)
resolve(res)
Expand Down