diff --git a/packages/vue-cli-plugin-uni/packages/postcss/index.js b/packages/vue-cli-plugin-uni/packages/postcss/index.js index a5880f7cb5f26557c7ada292c19560396b55cf7a..0b1300e0351c9c07967df9c9e39444853f2da5d2 100644 --- a/packages/vue-cli-plugin-uni/packages/postcss/index.js +++ b/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 => { diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js index 057e4846a32712fcfc116e4a0241aa86769c6fac..7565028e1eb84e4ae78a91880a0f564010248ca3 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js +++ b/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) { diff --git a/src/platforms/h5/view/components/picker/index.vue b/src/platforms/h5/view/components/picker/index.vue index ed50f725250c3325b1a5238d05cd431c33fe363e..1bc47204dc54cbdddfb09831654df26ab0c66841 100644 --- a/src/platforms/h5/view/components/picker/index.vue +++ b/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