Merge remote-tracking branch 'main/dev' into dev

This commit is contained in:
陈嘉涵 2017-08-16 23:08:10 +08:00
commit 7b882dca97
3 changed files with 6 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "vant", "name": "vant",
"version": "0.7.9", "version": "0.7.10",
"description": "有赞vue wap组件库", "description": "有赞vue wap组件库",
"main": "lib/vant.js", "main": "lib/vant.js",
"style": "lib/vant-css/index.css", "style": "lib/vant-css/index.css",

View File

@ -35,6 +35,10 @@ export default {
}, },
lockOnScroll: { lockOnScroll: {
default: true default: true
},
zIndex: {
type: [String, Number],
default: 2500
} }
}, },

View File

@ -1,6 +1,6 @@
{ {
"name": "vant-css", "name": "vant-css",
"version": "0.7.9", "version": "0.7.10",
"description": "vant css.", "description": "vant css.",
"main": "lib/index.css", "main": "lib/index.css",
"style": "lib/index.css", "style": "lib/index.css",