新增icon、filed组件新增time类型和Dialog组件默认文案修改 (#43)

This commit is contained in:
张敏
2017-06-26 15:02:27 +08:00
committed by GitHub
parent 4d778ef107
commit ecf587f7ed
7 changed files with 154 additions and 13 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
import Popup from 'src/mixins/popup';
const CANCEL_TEXT = '取消';
const CONFIRM_TEXT = '确';
const CONFIRM_TEXT = '确';
export default {
name: 'van-dialog',
+1 -1
View File
@@ -39,7 +39,7 @@
</template>
<script>
const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'datetime', 'password', 'textarea'];
const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
import vanCell from 'packages/cell';
export default {
Binary file not shown.
+10
View File
@@ -333,6 +333,16 @@ module.exports = {
keywords: ['underway'],
src: '进行中.svg',
css: 'underway'
},
{
keywords: ['point', 'gift'],
src: '积分礼包.svg',
css: 'point-gift'
},
{
keywords: ['after', 'sale'],
src: '售后记录.svg',
css: 'after-sale'
}
]
};
+8 -6
View File
@@ -2,11 +2,11 @@
@font-face {
font-family: 'vant-icon';
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-00a6bb93cd.ttf') format('truetype')
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.ttf') format('truetype')
}
.van-icon {
@@ -109,4 +109,6 @@
.van-icon-pending-evaluate:before { content: '\e83b'; } /* '' */
.van-icon-gift-card-pay:before { content: '\e83c'; } /* '' */
.van-icon-cash-on-deliver:before { content: '\e83d'; } /* '' */
.van-icon-underway:before { content: '\e83e'; } /* '' */
.van-icon-underway:before { content: '\e83e'; } /* '' */
.van-icon-point-gift:before { content: '\e83f'; } /* '' */
.van-icon-after-sale:before { content: '\e840'; } /* '' */