Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

This commit is contained in:
cookfront 2017-02-27 21:35:26 +08:00
commit 63c2dd85aa
4 changed files with 4 additions and 7 deletions

View File

@ -30,9 +30,6 @@ then
# publish # publish
git push origin master git push origin master
git push origin refs/tags/v$VERSION git push origin refs/tags/v$VERSION
git checkout dev
git rebase master
git push origin dev
npm publish npm publish
fi fi

View File

@ -1,6 +1,6 @@
{ {
"name": "@youzan/zanui-vue", "name": "@youzan/zanui-vue",
"version": "0.0.1", "version": "0.0.4",
"description": "有赞vue wap组件库", "description": "有赞vue wap组件库",
"main": "lib/zanui.js", "main": "lib/zanui.js",
"style": "lib/zanui-css/index.css", "style": "lib/zanui-css/index.css",
@ -120,4 +120,4 @@
"webpack-node-externals": "^1.5.4", "webpack-node-externals": "^1.5.4",
"webpack-vendor-chunk-plugin": "^1.0.0" "webpack-vendor-chunk-plugin": "^1.0.0"
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "@youzan/zanui-css", "name": "@youzan/zanui-css",
"version": "0.0.1", "version": "0.0.4",
"description": "zanui css.", "description": "zanui css.",
"main": "lib/index.css", "main": "lib/index.css",
"style": "lib/index.css", "style": "lib/index.css",

View File

@ -41,7 +41,7 @@ if (typeof window !== 'undefined' && window.Vue) {
export default { export default {
install, install,
version: '0.0.1', version: '0.0.4',
Button, Button,
Switch, Switch,
Field, Field,