Merge branch 'dev' of https://github.com/dcloudio/uni-app into dev

src/platforms/app-plus/service/framework/webview/index.js

@@ -8,7 +8,8 @@ import {
 } from './parser/webview-style-parser'
 
 import {
-  publish
+  publish,
+  setStatusBarStyle
 } from '../../bridge'
 
 let id = 2
@@ -75,6 +76,29 @@ export function initWebview (webview, routeOptions) {
     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'
+      })
+    }
+  })
+
   // TODO 应该结束之前未完成的下拉刷新
   on(webview.id + '.startPullDownRefresh', () => {
     webview.beginPullToRefresh()
@@ -85,4 +109,4 @@ export function initWebview (webview, routeOptions) {
   })
 
   return webview
-}
+}