diff --git a/package.json b/package.json index 1aafa38163c774823a7d3818827009c2b2822c43..becc645512951fc8d4846db6608fb2bcb69661b7 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 064fbca7617f7100f65533db620d3b86c178cf84..36edbb50374df06f739b1c14e4db5ecdae650941 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 e168daa3be406c6833a1bbe26c895ac0731bda6d..b54fe6654d6a8f987d1bd70ec26f24a12e73c9f8 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 3426110527d3e7e872fc73bcc02f23d020639db7..212bbc0ed52b970905039b7590c9c72e1fd9b32b 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"