Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

1
2
3
4
5
6
7
8
9
10
11
12
13
14
export default {
    props: {
        // 宫格的name
        name: {
            type: [String, Number, null],
            default: uni.$u.props.gridItem.name
        },
        // 背景颜色
        bgColor: {
            type: String,
            default: uni.$u.props.gridItem.bgColor
        }
    }
}