diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js index 0e2b930a31250796c2012c19688a53256b16bb42..3a18c9c3b8eafa69d8d0d6c243e9e0ec40d786d4 100644 --- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js +++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js @@ -229,7 +229,9 @@ module.exports = function () { }, resolveLoader: { alias: { - 'babel-loader': require.resolve('babel-loader') + 'babel-loader': require.resolve('babel-loader', { + paths: [require.resolve('@vue/cli-plugin-babel')] + }) } }, module: { diff --git a/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js b/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js index 8b2ce6924bde17f18851e84e1f2f25fb7e1c9352..184876ba0efdc625ef93e16d1883479c7730334c 100644 --- a/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js +++ b/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js @@ -21,8 +21,7 @@ module.exports = function generateApp (compilation) { process.env.NODE_ENV === 'production' && process.env.UNI_PLATFORM !== 'app-plus' ) { - const entryPage = Object.keys(process.UNI_ENTRY)[1] - const targetCssName = entryPage ? (entryPage + ext) : `common/main${ext}` + const targetCssName = `common/main${ext}` if (!compilation.assets[targetCssName]) { compilation.assets[targetCssName] = { diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js index 402f086a010973cc1394e1c3ef877478ee363227..27a2fea8e865c4220a145871bd63b982ea6aec2b 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js @@ -394,7 +394,20 @@ module.exports = function (pagesJson, userManifestJson) { // 带 tab if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) { const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar) - tabBar.borderStyle = tabBar.borderStyle === 'white' ? '#ffffff' : '#c6c6c6' + const borderStyles = { + black: 'rgba(0,0,0,0.8)', + white: 'rgba(255,255,255,0.8)' + } + let borderStyle = tabBar.borderStyle + if (!borderStyle) { + borderStyle = borderStyles.black + } + if (borderStyle in borderStyles) { + tabBar.borderStyle = borderStyles[borderStyle] + } + if (!tabBar.selectedColor) { + tabBar.selectedColor = '#0062cc' + } tabBar.height = `${parseFloat(tabBar.height) || TABBAR_HEIGHT}px` // 非纯 nvue 项目首页为 nvue 页面 if (!process.env.UNI_USING_NATIVE && isNVueEntryPage) { diff --git a/src/platforms/app-plus/service/framework/tab-bar.js b/src/platforms/app-plus/service/framework/tab-bar.js index 5a71af2168ceb893cd6fa7e3701d8ce3a46a3492..ead207d978e29c600971521c0b2c35eef3dde454 100644 --- a/src/platforms/app-plus/service/framework/tab-bar.js +++ b/src/platforms/app-plus/service/framework/tab-bar.js @@ -7,7 +7,7 @@ import { requireNativePlugin } from '../bridge' -const TABBAR_HEIGHT = 56 +const TABBAR_HEIGHT = 50 let config @@ -91,6 +91,7 @@ function showTabBar (animation) { } export default { + id: '0', init (options, clickCallback) { if (options && options.list.length) { config = options @@ -101,7 +102,7 @@ export default { console.log(`uni.requireNativePlugin("uni-tabview") error ${error}`) } tabBar && tabBar.onClick(({ index }) => { - clickCallback(config.list[index], index, true) + clickCallback(config.list[index], index) }) tabBar && tabBar.onMidButtonClick(() => { publish('onTabBarMidButtonTap', {}) @@ -146,5 +147,13 @@ export default { }, get height () { return config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT + }, + setStyle ({ mask }) { + tabBar.setMask({ + color: mask + }) + }, + addEventListener (name, callback) { + tabBar.onMaskClick(callback) } }