diff --git a/src/platforms/app-plus/service/framework/webview/index.js b/src/platforms/app-plus/service/framework/webview/index.js index 11bc6edc15fca345045d09577f511678478632a0..a2633883ee57422c991c28d312153d81bd36973a 100644 --- a/src/platforms/app-plus/service/framework/webview/index.js +++ b/src/platforms/app-plus/service/framework/webview/index.js @@ -8,13 +8,9 @@ import { } from './parser/webview-style-parser' import { - publish, + publish, setStatusBarStyle -} from '../../bridge' - -import { - getLastWebview -} from '../../api/util' +} from '../../bridge' let id = 2 @@ -78,29 +74,29 @@ export function initWebview (webview, routeOptions) { } publish('onViewDidResize', res) emit('onResize', res, parseInt(webview.id)) - }) - - webview.addEventListener('popGesture', e => { - if (e.type === 'start') { - // 设置下一个页面的 statusBarStyle - const pages = getCurrentPages() - const page = pages[pages.length - 2] - const statusBarStyle = page && page.$page.meta.statusBarStyle - statusBarStyle && setStatusBarStyle(statusBarStyle) - } else if (e.type === 'end' && !e.result) { - // 拖拽未完成,设置为当前状态栏前景色 - setStatusBarStyle() - } else if (e.type === 'end' && e.result) { - const pages = getCurrentPages() - const page = pages[pages.length - 1] - page && page.$remove() - - setStatusBarStyle() - - UniServiceJSBridge.emit('onAppRoute', { - type: 'navigateBack' - }) - } + }) + + webview.addEventListener('popGesture', e => { + if (e.type === 'start') { + // 设置下一个页面的 statusBarStyle + const pages = getCurrentPages() + const page = pages[pages.length - 2] + const statusBarStyle = page && page.$page.meta.statusBarStyle + statusBarStyle && setStatusBarStyle(statusBarStyle) + } else if (e.type === 'end' && !e.result) { + // 拖拽未完成,设置为当前状态栏前景色 + setStatusBarStyle() + } else if (e.type === 'end' && e.result) { + const pages = getCurrentPages() + const page = pages[pages.length - 1] + page && page.$remove() + + setStatusBarStyle() + + UniServiceJSBridge.emit('onAppRoute', { + type: 'navigateBack' + }) + } }) // TODO 应该结束之前未完成的下拉刷新 @@ -113,4 +109,4 @@ export function initWebview (webview, routeOptions) { }) return webview -} +}