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

This commit is contained in:
陈嘉涵 2017-09-14 20:06:12 +08:00
commit 2d744a0ca1
4 changed files with 14 additions and 7 deletions

View File

@ -108,7 +108,8 @@ const icons = [
'description', 'description',
'card', 'card',
'gift-card', 'gift-card',
'coupon' 'coupon',
'completed'
]; ];
const IconListConstructor = Vue.extend({ const IconListConstructor = Vue.extend({

View File

@ -393,6 +393,11 @@ module.exports = {
keywords: ['gold-coin'], keywords: ['gold-coin'],
src: '金币.svg', src: '金币.svg',
css: 'gold-coin' css: 'gold-coin'
},
{
keywords: ['completed'],
src: '已完成.svg',
css: 'completed'
} }
] ]
}; };

View File

@ -2,11 +2,11 @@
@font-face { @font-face {
font-family: 'vant-icon'; font-family: 'vant-icon';
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-5e6d465ada.eot'); src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a31c80aba.eot');
src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-5e6d465ada.eot?#iefix') format('embedded-opentype'), src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a31c80aba.eot?#iefix') format('embedded-opentype'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-5e6d465ada.woff2') format('woff2'), url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a31c80aba.woff2') format('woff2'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-5e6d465ada.woff') format('woff'), url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a31c80aba.woff') format('woff'),
url('https://b.yzcdn.cn/zanui/icon/vant-icon-5e6d465ada.ttf') format('truetype') url('https://b.yzcdn.cn/zanui/icon/vant-icon-1a31c80aba.ttf') format('truetype')
} }
.van-icon { .van-icon {
@ -121,4 +121,5 @@
.van-icon-gift-card:before { content: '\e847'; } /* '' */ .van-icon-gift-card:before { content: '\e847'; } /* '' */
.van-icon-coupon:before { content: '\e848'; } /* '' */ .van-icon-coupon:before { content: '\e848'; } /* '' */
.van-icon-clock:before { content: '\e849'; } /* '' */ .van-icon-clock:before { content: '\e849'; } /* '' */
.van-icon-gold-coin:before { content: '\e84a'; } /* '' */ .van-icon-gold-coin:before { content: '\e84a'; } /* '' */
.van-icon-completed:before { content: '\e84b'; } /* '' */