提交 6b30f3ed 编写于 作者: Q qiang

fix: app-v3 statusbarHeight

上级 c028d252
......@@ -39,13 +39,15 @@ function parsePageCreateOptions (vm, route) {
const onPageScroll = hasLifecycleHook(vm.$options, 'onPageScroll') ? 1 : 0
const onPageReachBottom = hasLifecycleHook(vm.$options, 'onReachBottom') ? 1 : 0
const statusbarHeight = getStatusbarHeight()
return {
disableScroll,
onPageScroll,
onPageReachBottom,
onReachBottomDistance,
windowTop: windowOptions.titleNView && windowOptions.titleNView.type === 'float' ? (getStatusbarHeight() + TITLEBAR_HEIGHT) : 0,
statusbarHeight,
windowTop: windowOptions.titleNView && windowOptions.titleNView.type === 'float' ? (statusbarHeight + TITLEBAR_HEIGHT) : 0,
windowBottom: (tabBar.indexOf(route) >= 0 && tabBar.cover) ? tabBar.height : 0
}
}
......
......@@ -10,6 +10,10 @@ import {
isTabBarPage
} from '../../../bridge'
import {
getStatusbarHeight
} from '../../../api/util'
import tabBar from '../../tab-bar'
function initPopupSubNVue (subNVueWebview, style, maskWebview) {
......@@ -96,7 +100,7 @@ function initSubNVue (subNVue, routeOptions, webview) {
style.dock = 'top'
style.top = 0
style.width = '100%'
style.height = TITLEBAR_HEIGHT + plus.navigator.getStatusbarHeight()
style.height = TITLEBAR_HEIGHT + getStatusbarHeight()
delete style.left
delete style.right
delete style.bottom
......
......@@ -20,6 +20,7 @@ const passiveOptions = supportsPassive ? {
} : false
function onCssVar ({
statusbarHeight,
windowTop,
windowBottom
}) {
......@@ -29,8 +30,9 @@ function onCssVar ({
const style = document.documentElement.style
style.setProperty('--window-top', windowTop + 'px')
style.setProperty('--window-bottom', windowBottom + 'px')
style.setProperty('--status-bar-height', plus.navigator.getStatusbarHeight() + 'px')
style.setProperty('--status-bar-height', statusbarHeight + 'px')
if (process.env.NODE_ENV !== 'production') {
console.log(`--status-bar-height=${statusbarHeight}`)
console.log(`--window-top=${windowTop}`)
console.log(`--window-bottom=${windowBottom}`)
}
......@@ -38,6 +40,7 @@ function onCssVar ({
}
function onPageCreate ({
statusbarHeight,
windowTop,
windowBottom,
disableScroll,
......@@ -46,6 +49,7 @@ function onPageCreate ({
onReachBottomDistance
}, pageId) {
onCssVar({
statusbarHeight,
windowTop,
windowBottom
})
......@@ -70,4 +74,4 @@ function onWebviewReady () { // service 主动发起检测
export default function initSubscribe (subscribe) {
subscribe(WEBVIEW_READY, onWebviewReady)
subscribe(ON_PAGE_CREATE, onPageCreate)
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册