Merge branch 'master' into dev

jeanary · Jan 12, 2019 · e1620f8 · e1620f8
2 parents 9d60729 + e48a128
commit e1620f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/packages/uni-h5/dist/index.umd.min.js b/packages/uni-h5/dist/index.umd.min.js
diff --git a/packages/uni-h5/package.json b/packages/uni-h5/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-h5",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"description": "uni-app h5",
 	"main": "dist/index.umd.min.js",
 	"scripts": {

diff --git a/src/core/helpers/protocol/tab-bar.js b/src/core/helpers/protocol/tab-bar.js
@@ -9,6 +9,8 @@ function beforeValidate (params) {
     if (pages[pages.length - 1].$page.meta.isTabBar) {
       isTabBar = true
     }
+  } else if (getApp().$children[0].hasTabBar) {
+    isTabBar = true
   }
   if (!isTabBar) {
     return 'not TabBar page'