提交 95b816e1 编写于 作者: fxy060608's avatar fxy060608

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

...@@ -404,7 +404,20 @@ module.exports = function (pagesJson, userManifestJson) { ...@@ -404,7 +404,20 @@ module.exports = function (pagesJson, userManifestJson) {
// 带 tab // 带 tab
if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) { if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar) 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` tabBar.height = `${parseFloat(tabBar.height) || TABBAR_HEIGHT}px`
// 非纯 nvue 项目首页为 nvue 页面 // 非纯 nvue 项目首页为 nvue 页面
if (!process.env.UNI_USING_NATIVE && isNVueEntryPage) { if (!process.env.UNI_USING_NATIVE && isNVueEntryPage) {
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
requireNativePlugin requireNativePlugin
} from '../bridge' } from '../bridge'
const TABBAR_HEIGHT = 56 const TABBAR_HEIGHT = 50
let config let config
...@@ -91,6 +91,7 @@ function showTabBar (animation) { ...@@ -91,6 +91,7 @@ function showTabBar (animation) {
} }
export default { export default {
id: '0',
init (options, clickCallback) { init (options, clickCallback) {
if (options && options.list.length) { if (options && options.list.length) {
config = options config = options
...@@ -101,7 +102,7 @@ export default { ...@@ -101,7 +102,7 @@ export default {
console.log(`uni.requireNativePlugin("uni-tabview") error ${error}`) console.log(`uni.requireNativePlugin("uni-tabview") error ${error}`)
} }
tabBar && tabBar.onClick(({ index }) => { tabBar && tabBar.onClick(({ index }) => {
clickCallback(config.list[index], index, true) clickCallback(config.list[index], index)
}) })
tabBar && tabBar.onMidButtonClick(() => { tabBar && tabBar.onMidButtonClick(() => {
publish('onTabBarMidButtonTap', {}) publish('onTabBarMidButtonTap', {})
...@@ -146,5 +147,13 @@ export default { ...@@ -146,5 +147,13 @@ export default {
}, },
get height () { get height () {
return config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT return config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT
},
setStyle ({ mask }) {
tabBar.setMask({
color: mask
})
},
addEventListener (name, callback) {
tabBar.onMaskClick(callback)
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册