From a59a9b82d1053a360b76d449d14ded65ff359627 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 20 Aug 2019 20:50:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=9A=90=E8=97=8Ftabb?=
 =?UTF-8?q?ar=E5=90=8Etab=E9=A1=B5=E9=AB=98=E5=BA=A6=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     | 3 ++-
 src/platforms/app-plus/service/bridge.js         | 2 +-
 src/platforms/app-plus/service/framework/page.js | 4 +++-
 yarn.lock                                        | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1aafa38163..becc645512 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
   },
   "private": true,
   "devDependencies": {
+    "@types/html5plus": "^1.0.0",
     "@vue/cli-plugin-babel": "^3.4.1",
     "@vue/cli-plugin-eslint": "^3.4.1",
     "@vue/cli-plugin-unit-mocha": "^3.4.1",
@@ -118,4 +119,4 @@
   "main": "index.js",
   "description": "",
   "author": ""
-}
+}
diff --git a/src/platforms/app-plus/service/bridge.js b/src/platforms/app-plus/service/bridge.js
index 064fbca761..36edbb5037 100644
--- a/src/platforms/app-plus/service/bridge.js
+++ b/src/platforms/app-plus/service/bridge.js
@@ -57,7 +57,7 @@ export function isTabBarPage (path = '') {
       }
       return page.$page.meta.isTabBar
     }
-    return __uniRoutes.find(route => route.path === path).meta.isTabBar
+    return !!__uniRoutes.find(route => route.path.slice(1) === path)
   } catch (e) {
     if (process.env.NODE_ENV !== 'production') {
       console.log('getCurrentPages is not ready')
diff --git a/src/platforms/app-plus/service/framework/page.js b/src/platforms/app-plus/service/framework/page.js
index e168daa3be..b54fe6654d 100644
--- a/src/platforms/app-plus/service/framework/page.js
+++ b/src/platforms/app-plus/service/framework/page.js
@@ -29,6 +29,8 @@ export function registerPage ({
 
   if (!webview) {
     webview = createWebview(path, routeOptions)
+  } else {
+    webview = plus.webview.getWebviewById(webview.id)
   }
 
   if (routeOptions.meta.isTabBar) {
@@ -75,4 +77,4 @@ export function registerPage ({
   })
 
   return webview
-}
+}
diff --git a/yarn.lock b/yarn.lock
index 3426110527..212bbc0ed5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -687,6 +687,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/html5plus@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/html5plus/-/html5plus-1.0.0.tgz#a88600fc9de85b785959754aea403c0a8d0714ba"
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-- 
GitLab