diff --git a/README.md b/README.md index 55e949a7..1c0adb1f 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,14 @@ npm run dev ```json { "usingComponents": { - "zan-button": "/path/to/vant-weapp/dist/btn/index" + "van-button": "/path/to/vant-weapp/dist/btn/index" } } ``` ```html -按钮 +按钮 ``` ![](https://img.yzcdn.cn/public_files/2017/02/08/1b1e39ed3dc6b63519a68ba1e2650cfc.png) @@ -78,12 +78,12 @@ npm run dev ```json { "usingComponents": { - "zan-toast": "/path/to/vant-weapp/dist/toast/index" + "van-toast": "/path/to/vant-weapp/dist/toast/index" } } ``` ```html - + ``` 将对应的 Toast 的函数引入页面,就可以直接调用来展示 Toast 了 @@ -96,7 +96,7 @@ const Toast = require('/path/to/vant-weapp/dist/toast/toast'); Page({ showToast() { Toast({ - selector: '#zan-toast-test', + selector: '#van-toast-test', message: 'toast内容' }); } diff --git a/changelog.md b/changelog.md index 848b65cd..e650d19f 100644 --- a/changelog.md +++ b/changelog.md @@ -246,7 +246,7 @@ **Improvements** -- 修复 zan-icon-new 展示 [\#66](https://github.com/youzan/vant-weapp/pull/66) ([pangxie1991](https://github.com/pangxie1991)) +- 修复 van-icon-new 展示 [\#66](https://github.com/youzan/vant-weapp/pull/66) ([pangxie1991](https://github.com/pangxie1991)) ## [v2.3.4](https://github.com/youzan/vant-weapp/tree/v2.3.4) (2017-11-24) [Full Changelog](https://github.com/youzan/vant-weapp/compare/v2.3.3...v2.3.4) diff --git a/dist/actionsheet/index.json b/dist/actionsheet/index.json index 9d70aaf4..5ec84cb6 100644 --- a/dist/actionsheet/index.json +++ b/dist/actionsheet/index.json @@ -1,6 +1,6 @@ { "component": true, "usingComponents": { - "zan-btn": "../btn/index" + "van-btn": "../btn/index" } } diff --git a/dist/actionsheet/index.wxml b/dist/actionsheet/index.wxml index de6b80d0..48c53780 100644 --- a/dist/actionsheet/index.wxml +++ b/dist/actionsheet/index.wxml @@ -1,39 +1,39 @@ - + - + - - - {{ item.name }} + + {{ item.name }} + class="van-actionsheet__subname"> {{ item.subname }} - + - {{ cancelText }} + >{{ cancelText }} diff --git a/dist/actionsheet/index.wxss b/dist/actionsheet/index.wxss index d580e64c..101f00db 100644 --- a/dist/actionsheet/index.wxss +++ b/dist/actionsheet/index.wxss @@ -1 +1 @@ -.zan-actionsheet{background-color:#f8f8f8}.zan-actionsheet__mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background:rgba(0,0,0,.7);display:none}.zan-actionsheet__container{position:fixed;left:0;right:0;bottom:0;background:#f8f8f8;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);-webkit-transform-origin:center;transform-origin:center;-webkit-transition:all .2s ease;transition:all .2s ease;z-index:11;opacity:0;visibility:hidden}.zan-actionsheet__btn{margin-bottom:0!important}.zan-actionsheet__footer .zan-actionsheet__btn{background:#fff}.zan-actionsheet__btn-content{display:-webkit-box;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row;-webkit-box-pack:center;justify-content:center}.zan-actionsheet__subname{color:#999}.zan-actionsheet__name,.zan-actionsheet__subname{height:45px;line-height:45px}.zan-actionsheet__btn.zan-btn:last-child::after{border-bottom-width:0}.zan-actionsheet__subname{margin-left:2px;font-size:12px}.zan-actionsheet__footer{margin-top:10px}.zan-actionsheet__btn--loading .zan-actionsheet__subname{color:transparent}.zan-actionsheet--show .zan-actionsheet__container{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);visibility:visible}.zan-actionsheet--show .zan-actionsheet__mask{display:block} \ No newline at end of file +.van-actionsheet{background-color:#f8f8f8}.van-actionsheet__mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background:rgba(0,0,0,.7);display:none}.van-actionsheet__container{position:fixed;left:0;right:0;bottom:0;background:#f8f8f8;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);-webkit-transform-origin:center;transform-origin:center;-webkit-transition:all .2s ease;transition:all .2s ease;z-index:11;opacity:0;visibility:hidden}.van-actionsheet__btn{margin-bottom:0!important}.van-actionsheet__footer .van-actionsheet__btn{background:#fff}.van-actionsheet__btn-content{display:-webkit-box;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row;-webkit-box-pack:center;justify-content:center}.van-actionsheet__subname{color:#999}.van-actionsheet__name,.van-actionsheet__subname{height:45px;line-height:45px}.van-actionsheet__btn.van-btn:last-child::after{border-bottom-width:0}.van-actionsheet__subname{margin-left:2px;font-size:12px}.van-actionsheet__footer{margin-top:10px}.van-actionsheet__btn--loading .van-actionsheet__subname{color:transparent}.van-actionsheet--show .van-actionsheet__container{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);visibility:visible}.van-actionsheet--show .van-actionsheet__mask{display:block} \ No newline at end of file diff --git a/dist/badge/index.wxml b/dist/badge/index.wxml index 322f1ba7..31b18476 100644 --- a/dist/badge/index.wxml +++ b/dist/badge/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/dist/badge/index.wxss b/dist/badge/index.wxss index 4e52bf72..fa21f8fa 100644 --- a/dist/badge/index.wxss +++ b/dist/badge/index.wxss @@ -1 +1 @@ -.zan-badge{position:relative}.zan-badge__text{position:absolute;top:-.8em;right:0;height:1.6em;min-width:1.6em;line-height:1.6;padding:0 .4em;font-size:20px;border-radius:.8em;background:#f44;color:#fff;text-align:center;white-space:nowrap;-webkit-transform:translateX(50%) scale(.5);transform:translateX(50%) scale(.5);-webkit-transform-origin:center;transform-origin:center;z-index:10;box-shadow:0 0 0 2px #fff;box-sizing:border-box} \ No newline at end of file +.van-badge{position:relative}.van-badge__text{position:absolute;top:-.8em;right:0;height:1.6em;min-width:1.6em;line-height:1.6;padding:0 .4em;font-size:20px;border-radius:.8em;background:#f44;color:#fff;text-align:center;white-space:nowrap;-webkit-transform:translateX(50%) scale(.5);transform:translateX(50%) scale(.5);-webkit-transform-origin:center;transform-origin:center;z-index:10;box-shadow:0 0 0 2px #fff;box-sizing:border-box} \ No newline at end of file diff --git a/dist/btn/index.wxml b/dist/btn/index.wxml index 13d69d79..4ad687b9 100644 --- a/dist/btn/index.wxml +++ b/dist/btn/index.wxml @@ -1,5 +1,5 @@