blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-05-22 22:49:15 +08:00
Code Issues Projects Releases Wiki Activity

[Improvement] Coupon: upgrade style (#1636)

Browse Source
This commit is contained in:
neverland 2018-08-16 19:58:37 +08:00 committed by GitHub
parent 0c740b19ff
commit 377ea7af9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 382 additions and 526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -61,7 +61,7 @@
"devDependencies": {
"@vue/server-test-utils": "^1.0.0-beta.24",
"@vue/test-utils": "^1.0.0-beta.24",
"autoprefixer": "^9.1.0",
"autoprefixer": "^9.1.1",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-jest": "^23.4.2",
@ -85,7 +85,7 @@
"husky": "^0.14.3",
"jest": "^23.5.0",
"jest-serializer-vue": "^2.0.2",
"lint-staged": "^7.2.0",
"lint-staged": "^7.2.2",
"md5-file": "^4.0.0",
"postcss": "^7.0.2",
"postcss-calc": "^6.0.0",
@ -100,7 +100,7 @@
"stylelint": "^9.4.0",
"stylelint-config-standard": "^18.2.0",
"uppercamelcase": "^3.0.0",
"url-loader": "^1.0.1",
"url-loader": "^1.1.0",
"vant-doc": "1.0.14",
"vue": "2.5.17",
"vue-jest": "^2.6.0",

12
packages/address-list/test/__snapshots__/demo.spec.js.snap
View File

@ -10,9 +10,9 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">张三，13000000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">张三，13000000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span></div>
</div>
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -20,9 +20,9 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">李四，1310000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">李四，1310000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
</div>
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -30,9 +30,9 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">王五，1320000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市滨江区江南大道 15 号</div></span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">王五，1320000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市滨江区江南大道 15 号</div></span></div>
</div>
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

18
packages/cell/test/__snapshots__/demo.spec.js.snap
View File

@ -35,7 +35,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-cell-group van-hairline--top-bottom">
<div class="van-cell van-hairline">
<i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-cell__title"><span>单元格</span>
@ -54,7 +54,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<!---->
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -64,7 +64,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<div class="van-cell__value"><span>内容</span></div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -74,7 +74,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<div class="van-cell__value"><span>内容</span></div>
<i class="van-icon van-icon-arrow van-cell__right-icon van-cell__right-icon--down" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon van-cell__right-icon--down" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -83,24 +83,24 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-cell-group van-hairline--top-bottom">
<div class="van-cell van-cell--clickable van-hairline">
<i class="van-icon van-icon-shop van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shop van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-cell__title"><span class="van-cell-text">单元格</span> <span class="van-hairline--surround van-tag van-tag--danger">标签</span></div>
<div class="van-cell__value"><span>内容</span></div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
<div class="van-cell van-cell--clickable van-hairline">
<i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-cell__title"><span>单元格</span>
<!---->
</div>
<!---->
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -110,7 +110,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<!---->
<i class="van-cell__right-icon van-icon van-icon-search" style="color:undefined;size:undefined;">
<i class="van-cell__right-icon van-icon van-icon-search" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

24
packages/checkbox/test/__snapshots__/demo.spec.js.snap
View File

@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">复选框</span></div>
@ -13,13 +13,13 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--disabled">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">复选框</span></div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--disabled van-checkbox__icon--checked">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">复选框</span></div>
@ -36,7 +36,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-checkbox-group">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -44,7 +44,7 @@ exports[`renders demo correctly 1`] = `
</span></div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -52,7 +52,7 @@ exports[`renders demo correctly 1`] = `
</span></div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -64,7 +64,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-checkbox-group">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -72,7 +72,7 @@ exports[`renders demo correctly 1`] = `
</span></div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -80,7 +80,7 @@ exports[`renders demo correctly 1`] = `
</span></div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">
@ -99,7 +99,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-cell__value">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -116,7 +116,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-cell__value">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -133,7 +133,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-cell__value">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

18
packages/collapse/test/__snapshots__/demo.spec.js.snap
View File

@ -9,7 +9,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞微商城</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -22,7 +22,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞零售</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -33,7 +33,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞美业</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -48,7 +48,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞微商城</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -61,7 +61,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞零售</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -72,7 +72,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞美业</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -88,12 +88,12 @@ exports[`renders demo correctly 1`] = `
<!---->
<div class="van-cell__value van-cell__value--alone">
<div>有赞微商城
<i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -104,7 +104,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">有赞零售</div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

14
packages/contact-card/test/__snapshots__/demo.spec.js.snap
View File

@ -5,12 +5,12 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-contact-card van-contact-card--add">
<div class="van-contact-card__content">
<i class="van-icon van-icon-add2 van-contact-card__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-add2 van-contact-card__icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-contact-card__text">添加订单联系人信息</div>
</div>
<i class="van-icon van-icon-arrow van-contact-card__arrow" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-contact-card__arrow" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -22,23 +22,23 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">联系电话：13000000000</p></span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">联系电话：13000000000</p></span></div>
</div>
<i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
</div>
</div>
<div class="van-hairline--top van-cell van-cell--clickable van-hairline van-contact-list__add">
<i class="van-icon van-icon-add van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-add van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-cell__title"><span>新建联系人</span>
<!---->
</div>
<!---->
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -91,7 +91,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-contact-card van-contact-card--edit van-contact-card--uneditable">
<div class="van-contact-card__content">
<i class="van-icon van-icon-contact van-contact-card__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-contact van-contact-card__icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-contact-card__text">

18
packages/coupon-list/Item.vue
View File

@ -1,25 +1,23 @@
<template>
<div :class="b({ disabled })">
<div :class="b('content')">
<div :class="b('head')">
<div :class="b('lines')" />
<div :class="b('gradient')">
<h2 v-html="faceAmount" />
<p>{{ conditionMessage }}</p>
</div>
</div>
<div :class="b('body')">
<h2>{{ data.name }}</h2>
<span>{{ validPeriod }}</span>
<p v-if="disabled && data.reason">{{ data.reason }}</p>
<div v-if="chosen" :class="b('corner')" >
<icon name="success" />
<p>{{ validPeriod }}</p>
<checkbox v-if="chosen" :class="b('corner')" :value="true" />
</div>
</div>
<p v-if="disabled && data.reason" :class="b('reason')">{{ data.reason }}</p>
</div>
</template>
<script>
import create from '../utils/create';
import Checkbox from '../checkbox';
export default create({
name: 'coupon-item',
@ -30,9 +28,13 @@ export default create({
disabled: Boolean
},
components: {
Checkbox
},
computed: {
validPeriod() {
return `${this.getDate(this.data.start_at)}-${this.getDate(this.data.end_at)}`;
return `${this.$t('valid')}：${this.getDate(this.data.start_at)} - ${this.getDate(this.data.end_at)}`;
},
faceAmount() {

2
packages/coupon-list/demo/index.vue
View File

@ -7,7 +7,7 @@
@click="showList = true"
/>
<van-popup v-model="showList" position="bottom" :lazy-render="false">
<van-popup v-model="showList" position="bottom">
<van-coupon-list
:coupons="coupons"
:chosen-coupon="chosenCoupon"

54
packages/coupon-list/index.vue
View File

@ -1,15 +1,16 @@
<template>
<div :class="b()">
<cell-group v-if="showExchangeBar" :class="b('top')">
<field
v-if="showExchangeBar"
v-model="currentCode"
clearable
:border="false"
:class="b('field')"
class="van-hairline--surround"
:placeholder="inputPlaceholder || $t('placeholder')"
:maxlength="20"
/>
>
<van-button
slot="button"
size="small"
type="danger"
:class="b('exchange')"
@ -18,8 +19,10 @@
:disabled="buttonDisabled"
@click="onClickExchangeButton"
/>
</cell-group>
<div :class="b('list', { 'with-exchange': showExchangeBar })" ref="list">
</field>
<tabs v-model="tab" :class="b('tab')" :line-width="120">
<tab :title="title">
<div :class="b('list')" :style="listStyle">
<coupon-item
ref="card"
v-for="(item, index) in coupons"
@ -28,23 +31,32 @@
:chosen="index === chosenCoupon"
@click.native="$emit('change', index)"
/>
<h3 v-if="disabledCoupons.length">{{ disabledListTitle || $t('disabled') }}</h3>
<div v-if="!coupons.length" :class="b('empty')">
<img src="https://img.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png" >
<p>{{ $t('empty') }}</p>
</div>
</div>
</tab>
<tab :title="disabledTitle">
<div :class="b('list')" :style="listStyle">
<coupon-item
disabled
v-for="item in disabledCoupons"
:key="item.id || item.name"
:data="item"
/>
<div v-if="!coupons.length && !disabledCoupons.length" :class="b('empty')">
<div v-if="!disabledCoupons.length" :class="b('empty')">
<img src="https://img.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png" >
<p>{{ $t('empty') }}</p>
</div>
</div>
<div
</tab>
</tabs>
<van-button
v-show="showCloseButton"
v-text="closeButtonText || $t('close')"
size="large"
:class="b('close')"
class="van-hairline--top"
:text="closeButtonText || $t('close')"
@click="$emit('change', -1)"
/>
</div>
@ -55,13 +67,17 @@ import create from '../utils/create';
import CouponItem from './Item';
import Field from '../field';
import VanButton from '../button';
import Tab from '../tab';
import Tabs from '../tabs';
export default create({
name: 'coupon-list',
components: {
VanButton,
Tab,
Tabs,
Field,
VanButton,
CouponItem
},
@ -109,6 +125,8 @@ export default create({
data() {
return {
tab: 0,
winHeight: window.innerHeight,
currentCode: this.code || ''
};
},
@ -120,6 +138,20 @@ export default create({
(this.exchangeButtonDisabled ||
this.currentCode.length < this.exchangeMinLength)
);
},
title() {
return `${this.$t('enable')} (${this.coupons.length})`;
},
disabledTitle() {
return `${this.$t('disabled')} (${this.disabledCoupons.length})`;
},
listStyle() {
return {
height: this.winHeight - (this.showExchangeBar ? 140 : 94) + 'px'
};
}
},

84
packages/coupon-list/test/__snapshots__/demo.spec.js.snap
View File

@ -10,94 +10,12 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<div class="van-cell__value"><span>您有 2 个可用优惠</span></div>
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
</div>
<div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
<div class="van-coupon-list">
<div class="van-cell-group van-hairline--top-bottom van-coupon-list__top">
<div placeholder="请输入优惠码" maxlength="20" class="van-hairline--surround van-cell van-hairline van-field van-coupon-list__field">
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
<div class="van-field__body">
<input type="text" placeholder="请输入优惠码" maxlength="20" value="" class="van-field__control">
<!---->
<!---->
<!---->
</div>
<!---->
</div>
<!---->
</div>
<button disabled="disabled" class="van-button van-button--danger van-button--small van-button--disabled van-button--unclickable van-coupon-list__exchange">
<!----><span class="van-button__text">兑换</span></button>
</div>
<div class="van-coupon-list__list van-coupon-list__list--with-exchange">
<div class="van-coupon-item">
<div class="van-coupon-item__head">
<div class="van-coupon-item__lines"></div>
<div class="van-coupon-item__gradient">
<h2><span>¥</span> 1.5</h2>
<p>无使用门槛</p>
</div>
</div>
<div class="van-coupon-item__body">
<h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
<!---->
<!---->
</div>
</div>
<div class="van-coupon-item">
<div class="van-coupon-item__head">
<div class="van-coupon-item__lines"></div>
<div class="van-coupon-item__gradient">
<h2>8.8折</h2>
<p>满0.50元可用</p>
</div>
</div>
<div class="van-coupon-item__body">
<h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
<!---->
<!---->
</div>
</div>
<h3>不可用优惠</h3>
<div class="van-coupon-item van-coupon-item--disabled">
<div class="van-coupon-item__head">
<div class="van-coupon-item__lines"></div>
<div class="van-coupon-item__gradient">
<h2><span>¥</span> 1.5</h2>
<p>无使用门槛</p>
</div>
</div>
<div class="van-coupon-item__body">
<h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
<p>优惠券不可用原因</p>
<!---->
</div>
</div>
<div class="van-coupon-item van-coupon-item--disabled">
<div class="van-coupon-item__head">
<div class="van-coupon-item__lines"></div>
<div class="van-coupon-item__gradient">
<h2>1折</h2>
<p>满0.50元可用</p>
</div>
</div>
<div class="van-coupon-item__body">
<h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
<p>优惠券不可用原因</p>
<!---->
</div>
</div>
<!---->
</div>
<div class="van-hairline--top van-coupon-list__close">不使用优惠</div>
</div>
</div>
</div>
</div>
`;

4
packages/field/test/__snapshots__/demo.spec.js.snap
View File

@ -32,7 +32,7 @@ exports[`renders demo correctly 1`] = `
<input type="text" placeholder="请输入用户名" value="" class="van-field__control">
<!---->
<div class="van-field__icon">
<i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -63,7 +63,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-cell-group van-hairline--top-bottom">
<div disabled="disabled" class="van-cell van-hairline van-field">
<i class="van-icon van-icon-contact van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-contact van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-cell__title"><span>用户名</span>

10
packages/goods-action/test/__snapshots__/demo.spec.js.snap
View File

@ -5,11 +5,11 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-goods-action">
<a class="van-hairline van-goods-action-mini-btn">
<i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
<!---->
</i> 客服</a>
<a class="van-hairline van-goods-action-mini-btn">
<i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
<!---->
</i> 购物车</a>
<a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">
@ -21,15 +21,15 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-goods-action">
<a class="van-hairline van-goods-action-mini-btn">
<i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
<!---->
</i> 客服</a>
<a class="van-hairline van-goods-action-mini-btn">
<i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
<div class="van-icon__info">5</div>
</i> 购物车</a>
<a class="van-hairline van-goods-action-mini-btn">
<i class="van-icon van-icon-shop van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shop van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
<!---->
</i> 店铺</a>
<a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">

186
packages/icon/test/__snapshots__/demo.spec.js.snap
View File

@ -4,375 +4,375 @@ exports[`renders demo correctly 1`] = `
<div>
<div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-close" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-close" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>close</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-upgrade" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-upgrade" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>upgrade</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-add-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-add-o" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>add-o</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-passed" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-passed" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>passed</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>chat</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>question</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-clock" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-clock" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>clock</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-gold-coin" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-gold-coin" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>gold-coin</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-play" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-play" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>play</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-pause" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-pause" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>pause</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-stop" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-stop" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>stop</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>more-o</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-info-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-info-o" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>info-o</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-share" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-share" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>share</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-like-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-like-o" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>like-o</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-logistics" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-logistics" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>logistics</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-edit" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>edit</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-exchange" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-exchange" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>exchange</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-location" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-location" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>location</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-cart" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-cart" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>cart</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-shop" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shop" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>shop</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-gift" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-gift" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>gift</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-contact" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-contact" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>contact</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-wap-home" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-wap-home" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>wap-home</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-points" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-points" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>points</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-discount" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-discount" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>discount</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-point-gift" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-point-gift" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>point-gift</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-after-sale" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-after-sale" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>after-sale</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-edit-data" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-edit-data" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>edit-data</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-delete" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-delete" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>delete</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>records</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-completed" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-completed" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>completed</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-certificate" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-certificate" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>certificate</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-tosend" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-tosend" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>tosend</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-sign" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-sign" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>sign</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-photo" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-photo" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>photo</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-idcard" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-idcard" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>idcard</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-home" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-home" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>home</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-free-postage" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-free-postage" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>free-postage</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-cash-back-record" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-cash-back-record" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>cash-back-record</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-points-mall" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-points-mall" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>points-mall</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-exchange-record" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-exchange-record" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>exchange-record</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-pending-payment" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-pending-payment" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>pending-payment</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-pending-orders" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-pending-orders" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>pending-orders</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-pending-deliver" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-pending-deliver" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>pending-deliver</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-pending-evaluate" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-pending-evaluate" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>pending-evaluate</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-password-view" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-password-view" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>password-view</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-password-not-view" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-password-not-view" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>password-not-view</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-check" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>check</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-arrow" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>arrow</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-arrow-left" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow-left" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>arrow-left</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-search" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-search" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>search</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>success</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-fail" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-fail" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>fail</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-add" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-add" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>add</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-checked" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>checked</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-warn" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-warn" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>warn</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-clear" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-clear" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>clear</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-underway" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-underway" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>underway</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-more" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-more" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>more</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-like" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-like" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>like</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>photograph</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-qr-invalid" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-qr-invalid" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>qr-invalid</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-qr" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-qr" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>qr</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-add2" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-add2" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>add2</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-wechat" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-wechat" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>wechat</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-alipay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-alipay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>alipay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-wap-nav" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-wap-nav" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>wap-nav</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-ecard-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-ecard-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>ecard-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-balance-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-balance-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>balance-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-peer-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-peer-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>peer-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-credit-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-credit-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>credit-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-debit-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-debit-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>debit-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-other-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-other-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>other-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-shopping-cart" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shopping-cart" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>shopping-cart</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-browsing-history" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-browsing-history" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>browsing-history</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-goods-collect" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-goods-collect" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>goods-collect</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-shop-collect" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shop-collect" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>shop-collect</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-receive-gift" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-receive-gift" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>receive-gift</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-send-gift" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-send-gift" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>send-gift</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-setting" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-setting" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>setting</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-coupon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-coupon" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>coupon</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-gift-card-pay" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-gift-card-pay" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>gift-card-pay</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-cash-on-deliver" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-cash-on-deliver" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>cash-on-deliver</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-phone" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-phone" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>phone</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-description" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-description" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>description</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-card" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-card" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>card</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-value-card" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-value-card" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>value-card</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-gift-card" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-gift-card" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>gift-card</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-hot" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-hot" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>hot</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-new" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-new" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>new</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-new-arrival" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-new-arrival" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>new-arrival</span></div>
<div class="van-col van-col--8">
<i class="van-icon van-icon-hot-sale" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-hot-sale" style="color:undefined;font-size:undefined;">
<!---->
</i> <span>hot-sale</span></div>
</div>

2
packages/locale/lang/en-US.js
View File

@ -40,10 +40,12 @@ export default {
empty: 'No coupons',
exchange: 'Exchange',
close: 'Close',
enable: 'Available',
disabled: 'Unavailable',
placeholder: 'Coupon code'
},
vanCouponItem: {
valid: 'Valid',
unlimited: 'Unlimited',
discount: discount => `${discount * 10}% off`,
condition: condition => `At least ${condition}`

4
packages/locale/lang/zh-CN.js
View File

@ -38,10 +38,12 @@ export default {
empty: '暂无优惠券',
exchange: '兑换',
close: '不使用优惠',
disabled: '不可用优惠',
enable: '可使用优惠券',
disabled: '不可使用优惠券',
placeholder: '请输入优惠码'
},
vanCouponItem: {
valid: '有效期',
unlimited: '无使用门槛',
discount: discount => `${discount}折`,
condition: (condition) => `满${condition}元可用`

5
packages/locale/lang/zh-HK.js
View File

@ -39,11 +39,12 @@ export default {
vanCouponList: {
empty: '暫無優惠券',
exchange: '兌換',
close: '不使用優惠',
disabled: '不可用優惠',
enable: '可使用優惠券',
disabled: '不可使用優惠券',
placeholder: '請輸入優惠碼'
},
vanCouponItem: {
valid: '有效期',
unlimited: '無使用門檻',
discount: discount => `${discount}折`,
condition: (condition) => `滿${condition}元可用`

6
packages/nav-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-hairline--bottom van-nav-bar" style="z-index:1;">
<div class="van-nav-bar__left">
<i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;font-size:undefined;">
<!---->
</i> <span class="van-nav-bar__text">返回</span></div>
<div class="van-ellipsis van-nav-bar__title">标题</div>
@ -15,12 +15,12 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-hairline--bottom van-nav-bar" style="z-index:1;">
<div class="van-nav-bar__left">
<i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;font-size:undefined;">
<!---->
</i> <span class="van-nav-bar__text">返回</span></div>
<div class="van-ellipsis van-nav-bar__title">标题</div>
<div class="van-nav-bar__right">
<i class="van-icon van-icon-search" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-search" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

4
packages/notice-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -28,7 +28,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-notice-bar__wrap">
<div class="van-notice-bar__content" style="padding-left:0;animation-delay:1s;animation-duration:0s;">足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。</div>
</div>
<i class="van-icon van-icon-close van-notice-bar__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-close van-notice-bar__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -37,7 +37,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-notice-bar__wrap">
<div class="van-notice-bar__content" style="padding-left:0;animation-delay:1s;animation-duration:0s;">足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。</div>
</div>
<i class="van-icon van-icon-arrow van-notice-bar__right-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-arrow van-notice-bar__right-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

12
packages/radio/test/__snapshots__/demo.spec.js.snap
View File

@ -4,14 +4,14 @@ exports[`renders demo correctly 1`] = `
<div>
<div>
<div class="demo-radio-group van-radio-group">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
</div>
</div>
<div>
<div class="demo-radio-group van-radio-group">
<div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="1" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
<div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="2" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
<div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="1" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
<div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="2" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
</div>
</div>
<div>
@ -23,7 +23,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<div class="van-cell__value">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span>
<!---->
</div>
</div>
@ -35,7 +35,7 @@ exports[`renders demo correctly 1`] = `
<!---->
</div>
<div class="van-cell__value">
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span>
<div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span>
<!---->
</div>
</div>

6
packages/search/test/__snapshots__/demo.spec.js.snap
View File

@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-search" style="background:#f2f2f2;">
<div placeholder="请输入搜索关键词" class="van-cell van-field">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
@ -27,7 +27,7 @@ exports[`renders demo correctly 1`] = `
<form action="/">
<div class="van-search van-search--show-action" style="background:#f2f2f2;">
<div placeholder="请输入搜索关键词" class="van-cell van-field">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
@ -51,7 +51,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-search van-search--show-action" style="background:#f2f2f2;">
<div placeholder="请输入搜索关键词" class="van-cell van-field">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->

8
packages/steps/test/__snapshots__/demo.spec.js.snap
View File

@ -16,7 +16,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-hairline van-step van-step--horizontal van-step--process">
<div class="van-step__title" style="color:#06bf04;">商家接单</div>
<div class="van-step__circle-container">
<i class="van-icon van-icon-checked" style="color:#06bf04;size:undefined;">
<i class="van-icon van-icon-checked" style="color:#06bf04;font-size:undefined;">
<!---->
</i>
</div>
@ -45,7 +45,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-steps van-steps--horizontal">
<div class="van-steps__status">
<div class="van-steps__icon">
<i class="van-icon van-icon-logistics steps-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-logistics steps-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>
@ -65,7 +65,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-hairline van-step van-step--horizontal van-step--process">
<div class="van-step__title" style="color:#06bf04;">商家接单</div>
<div class="van-step__circle-container">
<i class="van-icon van-icon-checked" style="color:#06bf04;size:undefined;">
<i class="van-icon van-icon-checked" style="color:#06bf04;font-size:undefined;">
<!---->
</i>
</div>
@ -98,7 +98,7 @@ exports[`renders demo correctly 1`] = `
<p>2016-07-12 12:40</p>
</div>
<div class="van-step__circle-container">
<i class="van-icon van-icon-checked" style="color:#f60;size:undefined;">
<i class="van-icon van-icon-checked" style="color:#f60;font-size:undefined;">
<!---->
</i>
</div>

2
packages/submit-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -48,7 +48,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-submit-bar__bar">
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div> <span class="van-checkbox__label">全选</span></div>

4
packages/tab/test/__snapshots__/demo.spec.js.snap
View File

@ -192,7 +192,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<div>
<div>
<i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
<!---->
</i>选项
</div>
@ -202,7 +202,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<div>
<div>
<i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
<!---->
</i>选项
</div>

12
packages/tabbar/test/__snapshots__/demo.spec.js.snap
View File

@ -6,7 +6,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed" style="z-index:1;">
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<i class="van-icon van-icon-shop" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-shop" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
@ -15,7 +15,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon van-tabbar-item__icon--dot">
<i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
@ -24,7 +24,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-icon__info">5</div>
@ -33,7 +33,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<i class="van-icon van-icon-gold-coin" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-gold-coin" style="color:undefined;font-size:undefined;">
<!---->
</i>
<div class="van-icon__info">20</div>
@ -53,7 +53,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->
@ -62,7 +62,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-tabbar-item">
<div class="van-tabbar-item__icon">
<i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
<!---->
</i>
<!---->

2
packages/tree-select/test/__snapshots__/demo.spec.js.snap
View File

@ -18,7 +18,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-tree-select__content" style="height:300px;">
<div class="van-ellipsis van-tree-select__item van-tree-select__item--active">
杭州
<i class="van-icon van-icon-success van-tree-select__selected" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-success van-tree-select__selected" style="color:undefined;font-size:undefined;">
<!---->
</i>
</div>

4
packages/uploader/test/__snapshots__/demo.spec.js.snap
View File

@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="demo-uploader-container">
<div class="van-uploader">
<i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
<!---->
</i>
<input type="file" accept="image/*" class="van-uploader__input">
@ -15,7 +15,7 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="demo-uploader-container">
<div class="van-uploader">
<i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
<i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
<!---->
</i>
<input type="file" accept="image/gif, image/jpeg" multiple="multiple" class="van-uploader__input">

4
packages/vant-css/src/address-list.css
View File

@ -32,7 +32,7 @@
&__group {
height: 100%;
overflow-y: scroll;
padding-bottom: 40px;
padding-bottom: 100px;
box-sizing: border-box;
-webkit-overflow-scrolling: touch;
background-color: $background-color;
@ -40,7 +40,7 @@
&__name {
font-size: 14px;
font-weight: bold;
font-weight: 500;
line-height: 20px;
margin-bottom: 5px;
}

2
packages/vant-css/src/badge.css
View File

@ -26,7 +26,7 @@
}
&--select {
font-weight: bold;
font-weight: 500;
color: $text-color;
border-color: $red;

232
packages/vant-css/src/coupon-list.css
View File

@ -1,5 +1,5 @@
@import './common/var.css';
@import "./mixins/ellipsis.css";
@import './mixins/ellipsis.css';
.van-coupon {
&-list {
@ -7,93 +7,27 @@
position: relative;
background-color: $background-color;
&__top {
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: 1;
padding-right: 85px;
box-sizing: border-box;
}
&__field {
margin: 10px 0;
padding: 4px 10px 4px 25px;
&::after {
border-radius: 6px;
border-color: #cacaca;
}
padding: 7px 15px;
}
&__exchange {
top: 10px;
right: 15px;
height: 32px;
line-height: 30px;
position: absolute;
border-radius: 2px;
}
&__list {
max-height: 100%;
overflow-y: auto;
padding: 15px 0 60px;
padding: 15px 0;
box-sizing: border-box;
-webkit-overflow-scrolling: touch;
h3 {
color: $gray-dark;
margin: 15px 0;
font-size: 14px;
font-weight: normal;
position: relative;
text-align: center;
&::before,
&::after {
content: ' ';
width: 45px;
height: 1px;
top: 50%;
position: absolute;
background-color: $border-color;
}
&::before {
left: 50%;
margin-left: -95px;
}
&::after {
right: 50%;
margin-right: -95px;
}
}
.van-coupon-item + h3 {
margin-top: 30px;
}
}
&__list--with-exchange {
padding-top: 60px;
}
&__close {
left: 0;
bottom: 0;
width: 100%;
font-size: 15px;
line-height: 45px;
text-align: center;
position: absolute;
background-color: $white;
&:active {
background-color: $active-color;
}
font-weight: 500;
}
&__empty {
@ -115,131 +49,95 @@
}
&-item {
overflow: hidden;
border-radius: 4px;
margin: 0 15px 15px;
background-color: $white;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
&:active {
background-color: $active-color;
}
&__content {
display: flex;
height: 100px;
margin: 0 15px 10px;
&__head {
display: flex;
height: 100%;
line-height: 1;
min-width: 126px;
padding: 24px 0 0 15px;
box-sizing: border-box;
}
&__lines {
height: 100%;
min-width: 18px;
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAADICAMAAAC3WLNTAAAAclBMVEUAAAD/cHD/gID/amr/a2v/cXH/amr/dHT/cHD/cnL/bW3/aGj/dXX/gID/Z2f/Z2f/bW3/dXX/Zmb/dnb/Z2f/d3f/a2v/dnb/c3P/dXX/dHT/eHj/dHT/amr/cXH/bm7/aGj/bW3/cHD/bGz/dnb/Z2fPFIA9AAAAHHRSTlMANwyaQpoMQkLm5uaaBvPVvZSUj48rK/Pz1dVCCskVeAAABKBJREFUWMOFmdd2GzEMRKH03ntW0a5l//8vBh0hB2JgcZ/umRkC4JNJ6uvnn983rvvtnos/UzHy9uP9poj/7qGY+aCIcULxB6CPiYQjKn1VrzVIn7eqCDVT9AtlNlD6sWFBpg7RAxBiI/To9GYi8ILE9fwlaI0YSf1ugG2G6E17w22ETg0DSo/6UBtAHbKBHXJbHxwvmdBzBJzCZiLiII4FpzgNGKNbpj9/tj8LTA8hgdkZYq01Jkr/1yJmVpxn4vrPBQXSVEuQAMFyO/ssoAi1ghRZp5cBPzVkQdmqeLAFxFQSPUdaT+2GwfTQKXrQY/6kjIH8AGHr0Q4wDF5MQtgCL0FKDJtZEGrpWKoEQY4KGDiAgNpQ6Q6E/oDSHUrNIDEDXAEFYXJQurvrHEdIkYljYsBIAFRCO5FatosE0QPpUUkh7GoNeLogrg1xvXhpGHZrWDrL1QvV+jICk/ZPPYQbXTC1eFIayjlcVIcMAcqYtOOy7ChWwZWCS252lHnBhFMolM0MpAd9LBf+48Iput2FASH4mBIKMcSVQq1hKF1MKYgJKyV1teqUyi8viVBhl6IQilwru+RSigsgp1ALleyU1B1ApZUAQi7Tx5cB/yOkFLx8W5XABqHQyqVToORyH4zz9S0hpmAf/CEMfrUQhsWTSmQOxhRATkRLBUG7SpYYBM/xFJPQi1FHuCG+Mq8SCKwY1rKxHEcB0AqxOxZIJCNG9A+5ooiFWikLZuMhRfggWOEFUgSJuqRChWEsg67GtMn9Ry5zE/u/nWPEbvwLuT6/QFModGToGkouhSvBA358RK5yLEaVuJ68cs9b4W3pHOk6Lx/Sesw3vEQwlPKHEFJ9LH9SdUOkEjrqhs4gdOJuFQepPLgP5+KnU3rCkazzfSprphP9RthYrlKHnl6LrlaBtBSdz9ezMemJkBLnUEpqgrgESQyWXpXCT4jMlVqViT9KFlhY2VWsrAm6Zi6/YPZLQIMSCQ4ab3b2SerfYRvkgEPmNWgdDhlZrVC5Syk94wEHUZOuCx65Kh6sMg1dzaUbu8VEVb47Far52BTj5cdDqCtCt5jzJzXd8NATz9qhZwqE35TrUnaBlVJ5evBizoOUOVoLlHG1EktHb2YxpVWLKmMJwDHnjtp52kekYgnnajQh1dRKL9A+C4VU7hdNjCHDnlqmHXMJWE2F4IDp7fa9cxxykSL8wfs5J8FFaO/tMjpDZohYgSQyejDUeVCqUL2nDni/wYSjrsprj7XfkMqlY+xmdF/fCgb5EzppsxDxWP6kNBTGutrHIVFyBJc57fYcD3IVPLrQZbcW7FH9alkzQ6iftY7FVXKKaPcP4VdELXrYAUNoYILYV0qVbKEUlwS7B/4DysVKCQwtFmTCKxpT0ANKwe0emlT2WWeqFUwlhkRu0S0ZMCPLfvqqNEr1NGLp+lgpF+srwVqsoFPY4RULeiZ3vHnD3SEGeqnBjhn5tY6uxK0SrB1QtkAIw1qpaGYJ4axtLMbYBRFjyIjg+lgBlVpT9G6ghEGO3g9M3yv6MhB+ZqVvKIR29CmBm6D8uxCRiSOmJq0dM0l9+/L+3crwL+JFMIL5LZlUAAAAAElFTkSuQmCC') no-repeat;
background-size: 18px 100px;
}
p,
h2 {
margin: 0;
&__gradient {
flex: 1;
color: $white;
display: flex;
text-align: center;
margin-left: -16px;
flex-direction: column;
justify-content: center;
background-image: linear-gradient(45deg, #ff6868, #ff8c8c);
@mixin ellipsis;
}
h2 {
font-size: 22px;
font-weight: normal;
margin: 0 0 10px;
span {
font-size: 16px;
}
height: 34px;
font-weight: 500;
line-height: 34px;
}
p {
margin: 0;
font-size: 14px;
font-weight: 300;
font-size: 12px;
line-height: 16px;
color: $gray-dark;
}
@mixin ellipsis;
&__head {
min-width: 90px;
h2 {
color: $red;
font-size: 24px;
span {
font-size: 50%;
}
}
}
&__body {
flex: 1;
height: 100%;
display: flex;
padding: 0 15px;
overflow: hidden;
position: relative;
background-color: $white;
flex-direction: column;
justify-content: center;
border-radius: 0 4px 4px 0;
h2 {
margin: 0;
opacity: .8;
font-size: 16px;
font-weight: normal;
}
}
p,
span {
color: $gray-dark;
font-size: 12px;
margin: 5px 0 0;
&__corner {
top: 16px;
right: 15px;
position: absolute;
.van-icon {
border-color: $red;
background-color: $red;
}
}
&__reason {
padding: 7px 15px;
background-color: #fbfbfb;
border-top: 1px dashed $border-color;
}
&--disabled {
&:active {
background-color: $white;
}
.van-coupon-item__content {
height: 90px;
}
p,
h2,
span {
line-height: 1.4;
@mixin ellipsis;
}
}
&__corner {
position: absolute;
top: 0;
right: 0;
width: 0;
height: 0;
border-style: solid;
border-width: 18px 19px;
border-radius: 0 4px 0 0;
border-color: $red $red transparent transparent;
.van-icon {
position: absolute;
top: -13px;
right: -13px;
color: $white;
font-size: 12px;
&::before {
font-weight: bold;
}
}
}
&:active {
.van-coupon-item__body {
background-color: $active-color;
}
}
&--disabled {
.van-coupon-item__lines {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAADICAMAAAC3WLNTAAAAWlBMVEUAAACqrremq7Oqv7+mq7Wqqr+rsLeprreqsrmqrralq7SkqbKrsbikqLGqwNWqrrmrr7mkqbGrsbijqLGnq7SssrimrLKlqrOnrLWprraqr7ekqbKrsLijqLGfTYl9AAAAF3RSTlMAN5oMQgya5kJC5uaSkgZC8/PV1b0rK6hQU+kAAASjSURBVFjDfZlJduMwDESZntJDeh5sUdb9r9kuA+AXA0iIIi/8X6FYALNJU/19+fWj3/pNT1V35NvLratgMvTtjxH+1NBLt7rLHbb7OwhVrSUhKQhz7z1Dv6xZoLWnH70vg5ESINDedkg5BrR0yrGs9Pbpw21SqxNvH593YsN+30OibhwvaQXUPgghVH1m6EkAXK30VllB+UeCMG7OmCPtlk5exN6TcWsRv0UE/aG0GIKxMsycfB9j6QgZwn7FgO/AYhSFq+7Q4hBgyMT9kJKkkhJiriTEuoKACereTw+Y98LTsDVvKdenDWAW6gh1lNwTGHvjEGGhRre+U3J0iKGGknl7zeCJjoBCDPQBBxXhY94WwlYFuXLQTfW979LKYKzvECKH3aLGRSCFnnPwK7UPi8VZ7IRAGH+9X9w7iv0a3GvjZG+F8Y8LRRS0fMQ0hUn0o2ws1wEB7tJqV4iEDKVlgZo5bDWYPQWiVzNmNCX2CMo9XSutziEFoTRjRNqkAwBBqBGBvSpMpEVwrXLgr9Gidi511FaQSZVASO2VkJqxRQPefw3GbX2syqdnqdEy2bd7F77qWRvU3ggp09LDvUMmu/crJVN+wlRA9CrG4+0eadmTteLeScW0/De3+zSEljIpD3Mx53WoGssbfQfgrwm6Un5EgAJCL0MAQ2r4AkoYzoBgBnbuiREilSGLw/YLpUuSChBjKAGltIBSzxDKUOpVQYbEx27ABTYiEOurUjvSi6V7V0ihxb3LqbNfXARqRvdXqmb8fgyI8eSNqNst834l41mNe1f1G38EHzE9w8ycZW5juVzEwCHl7S5CqJJrd0Sci9VUM8CcJ843qwnBVFUGCamJBU+OGVsEKsiYE18egQllJSLA1ZF3Nx6uyoYonRwRJbBM+oANtY6pbFU+iwBMp/R7x/dZa6yvGELVZ4aeRliEn6C3QlDzvgnyIvS6HYWpZJxQzRQUEYC5fTDCpFjleLf3jGWvhTG2oKKoBHEA2tZK1gxPpdC8XzXELosBOsIeYDsEEMpKOXugGjG1MyUW9VgJBqWC88cGfJKCgazKETiW7jhOFeubigvNRTjbGIPeFwRJAB1T3LvTwviJFhGshxRhnjl/jGVd0Sk9rUKoGroj4s7EtE/x9aqnhqQRptYzTysqJ578dQIZ475OIvATnhlfcVVjzZFwFXCthNipUo0xYHpVjK3KFxcTk8FYujuB0Hq0vkgJ0WeGnggrjYcrRRCRfwENBk+53SbEQUxl43ZAY48jwDvhz2GqAMuxbPcfPbF/Q4gBb5teoQMFtN0rkE3AiAqw6euBccRaaRMK5kccSsIQYmeMNUiAYU5iC08BGAGAkCBvuEZa+Wq0Gclh6SWl4X1Ogt1pmwMg2/6MYvCkj30/5mgDXi1PDrmNQxpoqxJCSCE3lk4KKdRLjDvWdwPAfQQ6LgJHnPK0CPxK2fnQA1MBCaDZ/oS0A4v9oty4MajNgVoEG7UOMaIgTJy7LZzHWGBWA+FswBTctMsZYr+AfpbAHFb7XQiZScy3rxliFfzd/h06wlY7kJp86d+FGTEhlO4UWgU6Bvzv6++fmWGE/wHKk5MgoCYAjwAAAABJRU5ErkJggg==');
}
.van-coupon-item__gradient {
background-image: linear-gradient(45deg, #a4a9b2, #b7bcc3);
}
&:active {
.van-coupon-item__body {
background: $white;
}
color: $gray-dark;
}
}
}

2
packages/vant-css/src/submit-bar.css
View File

@ -26,7 +26,7 @@
&__text {
flex: 1;
font-weight: bold;
font-weight: 500;
text-align: right;
color: $text-color;
padding-right: 12px;

83
yarn.lock
View File

@ -697,12 +697,12 @@ autoprefixer@^9.0.0:
postcss "^7.0.2"
postcss-value-parser "^3.2.3"
autoprefixer@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.0.tgz#566a70d1148046b96b31efa08090f1999ffb6d8c"
autoprefixer@^9.1.1:
version "9.1.1"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.1.tgz#e4ffa96c71270b8a1967d1542abc5f8453920a77"
dependencies:
browserslist "^4.0.1"
caniuse-lite "^1.0.30000872"
browserslist "^4.0.2"
caniuse-lite "^1.0.30000876"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^7.0.2"
@ -1684,6 +1684,14 @@ browserslist@^4.0.1:
electron-to-chromium "^1.3.52"
node-releases "^1.0.0-alpha.10"
browserslist@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.2.tgz#294388f5844bb3ab15ef7394ca17f49bf7a4e6f1"
dependencies:
caniuse-lite "^1.0.30000876"
electron-to-chromium "^1.3.57"
node-releases "^1.0.0-alpha.11"
bser@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@ -1820,9 +1828,9 @@ caniuse-lite@^1.0.30000865:
version "1.0.30000865"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz#70026616e8afe6e1442f8bb4e1092987d81a2f25"
caniuse-lite@^1.0.30000872:
version "1.0.30000874"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz#a641b1f1c420d58d9b132920ef6ba87bbdcd2223"
caniuse-lite@^1.0.30000876:
version "1.0.30000877"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000877.tgz#f189673b86ecc06436520e3e391de6a13ca923b4"
capture-stack-trace@^1.0.0:
version "1.0.0"
@ -2914,6 +2922,10 @@ electron-to-chromium@^1.3.52:
version "1.3.55"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz#f150e10b20b77d9d41afcca312efe0c3b1a7fdce"
electron-to-chromium@^1.3.57:
version "1.3.58"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
elegant-spinner@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@ -5242,15 +5254,6 @@ jest-util@^23.4.0:
slash "^1.0.0"
source-map "^0.6.0"
jest-validate@^23.0.0:
version "23.0.1"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f"
dependencies:
chalk "^2.0.1"
jest-get-type "^22.1.0"
leven "^2.1.0"
pretty-format "^23.0.1"
jest-validate@^23.5.0:
version "23.5.0"
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.5.0.tgz#f5df8f761cf43155e1b2e21d6e9de8a2852d0231"
@ -5546,11 +5549,10 @@ linkify-it@^2.0.0:
dependencies:
uc.micro "^1.0.1"
lint-staged@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.0.tgz#bdf4bb7f2f37fe689acfaec9999db288a5b26888"
lint-staged@^7.2.2:
version "7.2.2"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.2.tgz#0983d55d497f19f36d11ff2c8242b2f56cc2dd05"
dependencies:
app-root-path "^2.0.1"
chalk "^2.3.1"
commander "^2.14.1"
cosmiconfig "^5.0.2"
@ -5560,7 +5562,7 @@ lint-staged@^7.2.0:
find-parent-dir "^0.3.0"
is-glob "^4.0.0"
is-windows "^1.0.2"
jest-validate "^23.0.0"
jest-validate "^23.5.0"
listr "^0.14.1"
lodash "^4.17.5"
log-symbols "^2.2.0"
@ -6585,6 +6587,12 @@ node-releases@^1.0.0-alpha.10:
dependencies:
semver "^5.3.0"
node-releases@^1.0.0-alpha.11:
version "1.0.0-alpha.11"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
dependencies:
semver "^5.3.0"
node-source-walk@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-3.2.0.tgz#3c605cc53abdee4b45ab65e947dfb1db7c90f0e3"
@ -7583,13 +7591,6 @@ pretty-error@^2.0.2:
renderkid "^2.0.1"
utila "~0.4"
pretty-format@^23.0.1:
version "23.0.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4"
dependencies:
ansi-regex "^3.0.0"
ansi-styles "^3.2.0"
pretty-format@^23.5.0:
version "23.5.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c"
@ -8293,14 +8294,7 @@ sax@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
dependencies:
ajv "^6.1.0"
ajv-keywords "^3.1.0"
schema-utils@^1.0.0:
schema-utils@1.0.0, schema-utils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
dependencies:
@ -8308,6 +8302,13 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
schema-utils@^0.4.4, schema-utils@^0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
dependencies:
ajv "^6.1.0"
ajv-keywords "^3.1.0"
semver-compare@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@ -9468,13 +9469,13 @@ url-join@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
url-loader@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee"
url-loader@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.0.tgz#64dd296626d935c68d72ed9d9c69cf3c6ff933ac"
dependencies:
loader-utils "^1.1.0"
mime "^2.0.3"
schema-utils "^0.4.3"
schema-utils "1.0.0"
url-parse-lax@^1.0.0:
version "1.0.0"