From 502a8e0b654fd435c77419ca4e7cbfb6042815b8 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Fri, 22 Nov 2019 21:12:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(v3):=20=E4=BF=AE=E5=A4=8Dios=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=91=E5=8F=96=E6=B6=88=E6=97=B6=E4=B8=8D=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E9=A2=9C=E8=89=B2=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/app-plus/service/bridge.js              |  2 +-
 .../framework/webview/on-webview-pop-gesture.js       | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/platforms/app-plus/service/bridge.js b/src/platforms/app-plus/service/bridge.js
index 8c0fb197a..dc75ccc54 100644
--- a/src/platforms/app-plus/service/bridge.js
+++ b/src/platforms/app-plus/service/bridge.js
@@ -21,7 +21,7 @@ export function publish (name, ...args) {
   return UniServiceJSBridge.emit('api.' + name, ...args)
 }
 
-let lastStatusBarStyle
+export let lastStatusBarStyle
 
 const oldSetStatusBarStyle = plus.navigator.setStatusBarStyle
 
diff --git a/src/platforms/app-plus/service/framework/webview/on-webview-pop-gesture.js b/src/platforms/app-plus/service/framework/webview/on-webview-pop-gesture.js
index 2e6856664..e883fcab0 100644
--- a/src/platforms/app-plus/service/framework/webview/on-webview-pop-gesture.js
+++ b/src/platforms/app-plus/service/framework/webview/on-webview-pop-gesture.js
@@ -1,17 +1,20 @@
-import {
+import {
+  lastStatusBarStyle,
   setStatusBarStyle
 } from '../../bridge'
-export function onWebviewPopGesture (webview) {
+export function onWebviewPopGesture (webview) {
+  let popStartStatusBarStyle
   webview.addEventListener('popGesture', e => {
     if (e.type === 'start') {
       // 设置下一个页面的 statusBarStyle
       const pages = getCurrentPages()
-      const page = pages[pages.length - 2]
+      const page = pages[pages.length - 2]
+      popStartStatusBarStyle = lastStatusBarStyle
       const statusBarStyle = page && page.$page.meta.statusBarStyle
       statusBarStyle && setStatusBarStyle(statusBarStyle)
     } else if (e.type === 'end' && !e.result) {
       // 拖拽未完成,设置为当前状态栏前景色
-      setStatusBarStyle()
+      setStatusBarStyle(popStartStatusBarStyle)
     } else if (e.type === 'end' && e.result) {
       const pages = getCurrentPages()
       const page = pages[pages.length - 1]
-- 
GitLab