diff --git a/pages/index/index.js b/pages/index/index.js index 2baa48b..f9638e8 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -149,29 +149,16 @@ Page({ let newTop = this.data.sidebarBtnTop + diffY * 2; const systemInfo = wx.getSystemInfoSync(); - const screenHeight = systemInfo.screenHeight; - const safeArea = systemInfo.safeArea; + const screenHeight = systemInfo.screenHeight * 2; const btnHeight = 90; - const margin = 20; - const tabBarHeight = 70; - let minTop, maxTop; + const minTop = screenHeight * 0.1; + const maxTop = screenHeight * 0.75; - if (safeArea) { - minTop = safeArea.top + margin; - maxTop = safeArea.bottom - btnHeight - margin - tabBarHeight; - } else { - minTop = margin; - maxTop = screenHeight - btnHeight - margin - tabBarHeight; - } - - const minTopRpx = minTop * 2; - const maxTopRpx = maxTop * 2; - - if (newTop < minTopRpx) { - newTop = minTopRpx; - } else if (newTop > maxTopRpx) { - newTop = maxTopRpx; + if (newTop < minTop) { + newTop = minTop; + } else if (newTop > maxTop) { + newTop = maxTop; } this.setData({