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

packages/vue-cli-plugin-uni/packages/postcss/index.js

@@ -171,22 +171,24 @@ if (process.env.UNI_USING_V3) {
           if (!isInsideKeyframes(rule)) {
             // rule.selectors == comma seperated selectors
             // a, b.c {} => ["a", "b.c"]
-            rule.selectors = rule.selectors.map(complexSelector =>
+            rule.selectors = rule.selectors.map(complexSelector => {
               // complexSelector => simpleSelectors
               // "a.b#c" => ["a", ".b", "#c"]
-              transformSelector(complexSelector, simpleSelectors =>
+              if (complexSelector === 'page') {
+                hasPage = true
+              }
+              return transformSelector(complexSelector, simpleSelectors =>
                 // only process type selector, leave alone class & id selectors
                 simpleSelectors.walkTags(tag => {
                   if (tag.value === 'page') {
                     tag.value = 'uni-page-body'
-                    hasPage = true
                   } else if (~TAGS.indexOf(tag.value) && tag.value.substring(
                     0, 4) !== 'uni-') {
                     tag.value = 'uni-' + tag.value
                   }
                 })
               )
-            )
+            })
           }
           // handle upx unit
           rule.walkDecls(decl => {

packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js

@@ -24,7 +24,7 @@ function getTabBarPages (appJson) {
 }
 
 function isTabBarPage (pathName, tabBarPages) {
-  return tabBarPages.find(item => item.pagePath === pathName)
+  return tabBarPages && tabBarPages.find(item => item.pagePath === pathName)
 }
 
 function parseEntryPagePath (appJson, manifestJson) {

src/platforms/h5/view/components/picker/index.vue

@@ -298,7 +298,7 @@ export default {
       this._setValue()
       var $picker = this.$refs.picker
       $picker.remove();
-      (document.querySelector('uni-app') || document.body).append($picker)
+      (document.querySelector('uni-app') || document.body).appendChild($picker)
       $picker.style.display = 'block'
       setTimeout(() => {
         this.visible = true