blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
docs/examples-dist/icon.vue
View File

@ -1,4 +1,7 @@
<template><section class="demo-icon"><h1 class="demo-title">Icon 图标</h1><example-block title="所有Icon">
<van-icon name="qr-invalid" style="text-align: center"></van-icon>
</example-block><example-block title="所有Icon">
<van-row>
<van-col span="8">
<van-icon name="qr-invalid"></van-icon>
@ -64,10 +67,6 @@
<van-icon name="photo"></van-icon>
<span>photo</span>
</van-col>
<van-col span="8">
<van-icon name="logistics"></van-icon>
<span>logistics</span>
</van-col>
<van-col span="8">
<van-icon name="edit"></van-icon>
<span>edit</span>
@ -156,12 +155,124 @@
<van-icon name="other-pay"></van-icon>
<span>other-pay</span>
</van-col>
<van-col span="8">
<van-icon name="cart"></van-icon>
<span>cart</span>
</van-col>
<van-col span="8">
<van-icon name="browsing-history"></van-icon>
<span>browsing-history</span>
</van-col>
<van-col span="8">
<van-icon name="goods-collect"></van-icon>
<span>goods-collect</span>
</van-col>
<van-col span="8">
<van-icon name="shop-collect"></van-icon>
<span>shop-collect</span>
</van-col>
<van-col span="8">
<van-icon name="receive-gift"></van-icon>
<span>receive-gift</span>
</van-col>
<van-col span="8">
<van-icon name="send-gift"></van-icon>
<span>send-gift</span>
</van-col>
<van-col span="8">
<van-icon name="setting"></van-icon>
<span>setting</span>
</van-col>
<van-col span="8">
<van-icon name="points"></van-icon>
<span>points</span>
</van-col>
<van-col span="8">
<van-icon name="coupon"></van-icon>
<span>coupon</span>
</van-col>
<van-col span="8">
<van-icon name="free-postage"></van-icon>
<span>free-postage</span>
</van-col>
<van-col span="8">
<van-icon name="discount"></van-icon>
<span>discount</span>
</van-col>
<van-col span="8">
<van-icon name="birthday-privilege"></van-icon>
<span>birthday-privilege</span>
</van-col>
<van-col span="8">
<van-icon name="member-day-privilege"></van-icon>
<span>member-day-privilege</span>
</van-col>
<van-col span="8">
<van-icon name="balance-details"></van-icon>
<span>balance-details</span>
</van-col>
<van-col span="8">
<van-icon name="cash-back-record"></van-icon>
<span>cash-back-record</span>
</van-col>
<van-col span="8">
<van-icon name="points-mall"></van-icon>
<span>points-mall</span>
</van-col>
<van-col span="8">
<van-icon name="exchange-record"></van-icon>
<span>exchange-record</span>
</van-col>
<van-col span="8">
<van-icon name="pending-payment"></van-icon>
<span>pending-payment</span>
</van-col>
<van-col span="8">
<van-icon name="pending-orders"></van-icon>
<span>pending-orders</span>
</van-col>
<van-col span="8">
<van-icon name="pending-deliver"></van-icon>
<span>pending-deliver</span>
</van-col>
<van-col span="8">
<van-icon name="logistics"></van-icon>
<span>logistics</span>
</van-col>
<van-col span="8">
<van-icon name="pending-evaluate"></van-icon>
<span>pending-evaluate</span>
</van-col>
<van-col span="8">
<van-icon name="cash-on-deliver"></van-icon>
<span>cash-on-deliver</span>
</van-col>
<van-col span="8">
<van-icon name="gift-card-pay"></van-icon>
<span>gift-card-pay</span>
</van-col>
<van-col span="8">
<van-icon name="underway"></van-icon>
<span>underway</span>
</van-col>
<van-col span="8">
<van-icon name="point-gift"></van-icon>
<span>point-gift</span>
</van-col>
<van-col span="8">
<van-icon name="after-sale"></van-icon>
<span>after-sale</span>
</van-col>
</van-row>
</example-block></section></template>
<style>
@component-namespace demo {
@b icon {
.examples {
max-height: none;
}
.van-col {
text-align: center;
height: 120px;

20
docs/examples-docs/icon.md
View File

@ -56,7 +56,17 @@ export default {
#### 基础用法
设置`name`属性为对应的图标名称即可，以下目前有的所有图标：
设置`name`属性为对应的图标名称即可：
:::demo 所有Icon
```html
<van-icon name="qr-invalid" style="text-align: center"></van-icon>
```
:::
#### 所有Icons
以下目前有的所有图标及其名称：
:::demo 所有Icon
```html
@ -313,6 +323,14 @@ export default {
<van-icon name="underway"></van-icon>
<span>underway</span>
</van-col>
<van-col span="8">
<van-icon name="point-gift"></van-icon>
<span>point-gift</span>
</van-col>
<van-col span="8">
<van-icon name="after-sale"></van-icon>
<span>after-sale</span>
</van-col>
</van-row>
```
:::

2
packages/dialog/src/dialog.vue
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',

2
packages/field/src/field.vue
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 {

BIN
packages/vant-css/assets/icons.sketch
View File

Binary file not shown.

10
packages/vant-css/scripts/fount-config.js
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'
}
]
};

12
packages/vant-css/src/icon.css
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 {
@ -110,3 +110,5 @@
.van-icon-gift-card-pay:before { content: '\e83c'; } /* '' */
.van-icon-cash-on-deliver:before { content: '\e83d'; } /* '' */
.van-icon-underway:before { content: '\e83e'; } /* '' */
.van-icon-point-gift:before { content: '\e83f'; } /* '' */
.van-icon-after-sale:before { content: '\e840'; } /* '' */