blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-24 10:20:19 +08:00
Code Issues Projects Releases Wiki Activity

[Improvement] AddressEdit: optimize style (#1676)

Browse Source
This commit is contained in:
neverland 2018-08-24 10:44:09 +08:00 committed by GitHub
parent 7d8fff70af
commit fddf566f42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 79 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/address-edit/index.vue
View File

@ -4,8 +4,8 @@
<field <field
v-model="data.name" v-model="data.name"
maxlength="15" maxlength="15"
:placeholder="$t('name')" :label="$t('name')"
:label="$t('receiver')" :placeholder="$t('namePlaceholder')"
:error="errorInfo.name" :error="errorInfo.name"
@focus="onFocus('name')" @focus="onFocus('name')"
/> />
@ -20,7 +20,7 @@
<field <field
readonly readonly
:label="$t('area')" :label="$t('area')"
:placeholder="$t('area')" :placeholder="$t('areaPlaceholder')"
:value="areaText" :value="areaText"
@click="showArea = true" @click="showArea = true"
/> />
@ -57,7 +57,7 @@
</cell-group> </cell-group>
<div v-show="!hideBottomFields" :class="b('buttons')"> <div v-show="!hideBottomFields" :class="b('buttons')">
<van-button block :loading="isSaving" @click="onSave" type="primary"> <van-button block :loading="isSaving" @click="onSave" type="danger">
{{ saveButtonText || $t('save') }} {{ saveButtonText || $t('save') }}
</van-button> </van-button>
<van-button block :loading="isDeleting" @click="onDelete" v-if="showDelete"> <van-button block :loading="isDeleting" @click="onDelete" v-if="showDelete">

24
packages/address-edit/test/__snapshots__/demo.spec.js.snap
View File

@ -5,14 +5,14 @@ exports[`renders demo correctly 1`] = `
<div> <div>
<div class="van-address-edit"> <div class="van-address-edit">
<div class="van-cell-group van-hairline--top-bottom"> <div class="van-cell-group van-hairline--top-bottom">
<div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field"> <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收货人</span> <div class="van-cell__title"><span>姓名</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" maxlength="15" placeholder="名字" value="" class="van-field__control"> <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -21,14 +21,14 @@ exports[`renders demo correctly 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="手机或固定电话" class="van-cell van-hairline van-field"> <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>联系电话</span> <div class="van-cell__title"><span>电话</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="tel" placeholder="手机或固定电话" value="" class="van-field__control"> <input type="tel" placeholder="收货人手机号" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -37,14 +37,14 @@ exports[`renders demo correctly 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="收件地区" class="van-cell van-hairline van-field"> <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收件地区</span> <div class="van-cell__title"><span>地区</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" readonly="readonly" placeholder="收件地区" value="" class="van-field__control"> <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -54,14 +54,14 @@ exports[`renders demo correctly 1`] = `
<!----> <!---->
</div> </div>
<div> <div>
<div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field"> <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>详细地址</span> <div class="van-cell__title"><span>详细地址</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control"></textarea> <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea>
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -103,7 +103,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
<div class="van-address-edit__buttons"> <div class="van-address-edit__buttons">
<button class="van-button van-button--primary van-button--normal van-button--block"> <button class="van-button van-button--danger van-button--normal van-button--block">
<!----><span class="van-button__text"> <!----><span class="van-button__text">
保存 保存
</span></button> </span></button>

48
packages/address-edit/test/__snapshots__/index.spec.js.snap
View File

@ -3,14 +3,14 @@
exports[`create a AddressEdit 1`] = ` exports[`create a AddressEdit 1`] = `
<div class="van-address-edit"> <div class="van-address-edit">
<div class="van-cell-group van-hairline--top-bottom"> <div class="van-cell-group van-hairline--top-bottom">
<div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field"> <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收货人</span> <div class="van-cell__title"><span>姓名</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" maxlength="15" placeholder="名字" value="" class="van-field__control"> <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -19,14 +19,14 @@ exports[`create a AddressEdit 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="手机或固定电话" class="van-cell van-hairline van-field"> <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>联系电话</span> <div class="van-cell__title"><span>电话</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="tel" placeholder="手机或固定电话" value="" class="van-field__control"> <input type="tel" placeholder="收货人手机号" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -35,14 +35,14 @@ exports[`create a AddressEdit 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="收件地区" class="van-cell van-hairline van-field"> <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收件地区</span> <div class="van-cell__title"><span>地区</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" readonly="readonly" placeholder="收件地区" value="" class="van-field__control"> <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -52,14 +52,14 @@ exports[`create a AddressEdit 1`] = `
<!----> <!---->
</div> </div>
<div> <div>
<div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field"> <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>详细地址</span> <div class="van-cell__title"><span>详细地址</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control"></textarea> <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea>
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -73,7 +73,7 @@ exports[`create a AddressEdit 1`] = `
<!----> <!---->
</div> </div>
<div class="van-address-edit__buttons"> <div class="van-address-edit__buttons">
<button class="van-button van-button--primary van-button--normal van-button--block"> <button class="van-button van-button--danger van-button--normal van-button--block">
<!----><span class="van-button__text"> <!----><span class="van-button__text">
保存 保存
</span></button> </span></button>
@ -109,14 +109,14 @@ exports[`create a AddressEdit 1`] = `
exports[`create a AddressEdit with props 1`] = ` exports[`create a AddressEdit with props 1`] = `
<div class="van-address-edit"> <div class="van-address-edit">
<div class="van-cell-group van-hairline--top-bottom"> <div class="van-cell-group van-hairline--top-bottom">
<div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field"> <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收货人</span> <div class="van-cell__title"><span>姓名</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" maxlength="15" placeholder="名字" value="测试" class="van-field__control"> <input type="text" maxlength="15" placeholder="收货人姓名" value="测试" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -125,14 +125,14 @@ exports[`create a AddressEdit with props 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="手机或固定电话" class="van-cell van-hairline van-field"> <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>联系电话</span> <div class="van-cell__title"><span>电话</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="tel" placeholder="手机或固定电话" value="13000000000" class="van-field__control"> <input type="tel" placeholder="收货人手机号" value="13000000000" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -141,14 +141,14 @@ exports[`create a AddressEdit with props 1`] = `
</div> </div>
<!----> <!---->
</div> </div>
<div placeholder="收件地区" class="van-cell van-hairline van-field"> <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>收件地区</span> <div class="van-cell__title"><span>地区</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<input type="text" readonly="readonly" placeholder="收件地区" value="北京市 北京市 朝阳区" class="van-field__control"> <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="北京市 北京市 朝阳区" class="van-field__control">
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -158,14 +158,14 @@ exports[`create a AddressEdit with props 1`] = `
<!----> <!---->
</div> </div>
<div> <div>
<div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field"> <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>详细地址</span> <div class="van-cell__title"><span>详细地址</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
<div class="van-field__body"> <div class="van-field__body">
<textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control">详细地址</textarea> <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control">详细地址</textarea>
<!----> <!---->
<!----> <!---->
<!----> <!---->
@ -207,7 +207,7 @@ exports[`create a AddressEdit with props 1`] = `
</div> </div>
</div> </div>
<div class="van-address-edit__buttons"> <div class="van-address-edit__buttons">
<button class="van-button van-button--primary van-button--normal van-button--block"> <button class="van-button van-button--danger van-button--normal van-button--block">
<!----><span class="van-button__text"> <!----><span class="van-button__text">
保存 保存
</span></button> </span></button>

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

@ -22,7 +22,7 @@ exports[`renders demo correctly 1`] = `
<!----> <!---->
<!----> <!---->
<div class="van-cell__value van-cell__value--alone"> <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;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 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> </div>
<i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;"> <i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;">
<!----> <!---->
@ -65,7 +65,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
<div placeholder="手机或固定电话" class="van-cell van-hairline van-field"> <div placeholder="手机或固定电话" class="van-cell van-hairline van-field">
<!----> <!---->
<div class="van-cell__title"><span>联系电话</span> <div class="van-cell__title"><span>电话</span>
<!----> <!---->
</div> </div>
<div class="van-cell__value"> <div class="van-cell__value">
@ -96,7 +96,7 @@ exports[`renders demo correctly 1`] = `
</i> </i>
<div class="van-contact-card__text"> <div class="van-contact-card__text">
<div>联系人：张三</div> <div>联系人：张三</div>
<div>联系电话：13000000000</div> <div>电话：13000000000</div>
</div> </div>
</div> </div>
<!----> <!---->

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

@ -135,7 +135,7 @@ export default create({
buttonDisabled() { buttonDisabled() {
return ( return (
!this.exchangeButtonLoading && !this.exchangeButtonLoading &&
(this.exchangeButtonDisabled || (this.exchangeButtonDisabled || !this.currentCode ||
this.currentCode.length < this.exchangeMinLength) this.currentCode.length < this.exchangeMinLength)
); );
}, },

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

@ -9,6 +9,7 @@ export default {
contact: 'Name', contact: 'Name',
loadingTip: 'Loading...', loadingTip: 'Loading...',
nameEmpty: 'Name can not be empty', nameEmpty: 'Name can not be empty',
confirmDelete: 'Are you sure you want to delete?',
telInvalid: 'Malformed phone number', telInvalid: 'Malformed phone number',
telPlaceholder: 'Phone', telPlaceholder: 'Phone',
vanContactCard: { vanContactCard: {
@ -17,9 +18,6 @@ export default {
vanContactList: { vanContactList: {
addText: 'Add new contact' addText: 'Add new contact'
}, },
vanContactEdit: {
confirmDelete: 'Are you sure you want to delete this contact?'
},
vanPagination: { vanPagination: {
prev: 'Previous', prev: 'Previous',
next: 'Next' next: 'Next'
@ -52,13 +50,14 @@ export default {
}, },
vanAddressEdit: { vanAddressEdit: {
area: 'Area', area: 'Area',
receiver: 'Receiver',
postal: 'Postal', postal: 'Postal',
areaEmpty: 'Please select a receiving area', areaEmpty: 'Please select a receiving area',
addressEmpty: 'Address can not be empty', addressEmpty: 'Address can not be empty',
postalEmpty: 'Wrong postal code', postalEmpty: 'Wrong postal code',
defaultAddress: 'Set as the default address', defaultAddress: 'Set as the default address',
confirmDelete: 'Are you sure you want to delete this address?' telPlaceholder: 'Phone',
namePlaceholder: 'Name',
areaPlaceholder: 'Area'
}, },
vanAddressEditDetail: { vanAddressEditDetail: {
label: 'Address', label: 'Address',

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

@ -1,6 +1,6 @@
export default { export default {
name: '名字', name: '姓名',
tel: '联系电话', tel: '电话',
save: '保存', save: '保存',
confirm: '确认', confirm: '确认',
cancel: '取消', cancel: '取消',
@ -8,9 +8,9 @@ export default {
complete: '完成', complete: '完成',
contact: '联系人', contact: '联系人',
loadingTip: '加载中...', loadingTip: '加载中...',
nameEmpty: '请填写名字', nameEmpty: '请填写姓名',
confirmDelete: '确定要删除么', confirmDelete: '确定要删除么',
telInvalid: '请填写正确的联系电话', telInvalid: '请填写正确的电话',
telPlaceholder: '手机或固定电话', telPlaceholder: '手机或固定电话',
vanContactCard: { vanContactCard: {
addText: '添加订单联系人信息' addText: '添加订单联系人信息'
@ -49,17 +49,19 @@ export default {
condition: (condition) => `满${condition}元可用` condition: (condition) => `满${condition}元可用`
}, },
vanAddressEdit: { vanAddressEdit: {
area: '收件地区', area: '地区',
receiver: '收货人',
postal: '邮政编码', postal: '邮政编码',
areaEmpty: '请选择收件地区', areaEmpty: '请选择地区',
addressEmpty: '请填写详细地址', addressEmpty: '请填写详细地址',
postalEmpty: '邮政编码格式不正确', postalEmpty: '邮政编码格式不正确',
defaultAddress: '设为默认收货地址' defaultAddress: '设为默认收货地址',
telPlaceholder: '收货人手机号',
namePlaceholder: '收货人姓名',
areaPlaceholder: '选择省 / 市 / 区'
}, },
vanAddressEditDetail: { vanAddressEditDetail: {
label: '详细地址', label: '详细地址',
placeholder: '如街道、楼层、门牌号等' placeholder: '街道门牌、楼层房间号等信息'
}, },
vanAddressList: { vanAddressList: {
address: '收货地址', address: '收货地址',

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

@ -1,24 +1,22 @@
export default { export default {
name: '姓名', name: '姓名',
tel: '聯絡電話', tel: '電話',
save: '儲存', save: '保存',
confirm: '確認', confirm: '確認',
cancel: '取消', cancel: '取消',
delete: '刪除', delete: '刪除',
complete: '完成', complete: '完成',
contact: '聯絡人', contact: '聯系人',
loadingTip: '加載中...', loadingTip: '加載中...',
nameEmpty: '請填寫姓名', nameEmpty: '請填寫姓名',
telInvalid: '請填寫正確的電話號碼', confirmDelete: '確定要刪除麽',
telPlaceholder: '電話號碼', telInvalid: '請填寫正確的電話',
telPlaceholder: '手機或固定電話',
vanContactCard: { vanContactCard: {
addText: '添加訂單聯絡人信息' addText: '添加訂單聯系人信息'
}, },
vanContactList: { vanContactList: {
addText: '新增聯絡人' addText: '新建聯系人'
},
vanContactEdit: {
confirmDelete: '確定要刪除這個聯絡人嗎'
}, },
vanPagination: { vanPagination: {
prev: '上一頁', prev: '上一頁',
@ -39,6 +37,7 @@ export default {
vanCouponList: { vanCouponList: {
empty: '暫無優惠券', empty: '暫無優惠券',
exchange: '兌換', exchange: '兌換',
close: '不使用優惠',
enable: '可使用優惠券', enable: '可使用優惠券',
disabled: '不可使用優惠券', disabled: '不可使用優惠券',
placeholder: '請輸入優惠碼' placeholder: '請輸入優惠碼'
@ -50,22 +49,23 @@ export default {
condition: (condition) => `滿${condition}元可用` condition: (condition) => `滿${condition}元可用`
}, },
vanAddressEdit: { vanAddressEdit: {
area: '收件地區', area: '地區',
receiver: '收貨人',
postal: '郵政編碼', postal: '郵政編碼',
areaEmpty: '請選擇收件地區', areaEmpty: '請選擇地區',
addressEmpty: '請填寫詳細地址', addressEmpty: '請填寫詳細地址',
postalEmpty: '郵政編碼格式不正確', postalEmpty: '郵政編碼格式不正確',
defaultAddress: '設為默認收貨地址', defaultAddress: '設為默認收貨地址',
confirmDelete: '確定要刪除這個收貨地址麼' telPlaceholder: '收貨人手機號',
namePlaceholder: '收貨人姓名',
areaPlaceholder: '選擇省 / 市 / 區'
}, },
vanAddressEditDetail: { vanAddressEditDetail: {
label: '詳細地址', label: '詳細地址',
placeholder: '如街道、樓層、門牌號等' placeholder: '街道門牌、樓層房間號等信息'
}, },
vanAddressList: { vanAddressList: {
address: '收貨地址', address: '收貨地址',
add: '新增收貨地址' add: '新增地址'
}, },
vanSku: { vanSku: {
unavailable: '商品已經無法購買啦', unavailable: '商品已經無法購買啦',
@ -83,14 +83,14 @@ export default {
fill: '請填寫', fill: '請填寫',
upload: '請上傳', upload: '請上傳',
number: '請填寫正確的數字格式留言', number: '請填寫正確的數字格式留言',
email: '請填寫正確的電郵地址', email: '請填寫正確的郵箱',
id_no: '請填寫正確的身份證號碼', id_no: '請填寫正確的身份證號碼',
onePic: '僅限一張', onePic: '僅限一張',
placeholder: { placeholder: {
id_no: '輸入身份證號碼', id_no: '輸入身份證號碼',
text: '輸入文本', text: '輸入文本',
tel: '輸入數字', tel: '輸入數字',
email: '輸入電郵地址', email: '輸入郵箱',
date: '點擊選擇日期', date: '點擊選擇日期',
time: '點擊選擇時間', time: '點擊選擇時間',
textarea: '點擊填寫段落文本' textarea: '點擊填寫段落文本'
@ -107,7 +107,7 @@ export default {
}, },
vanSkuStepper: { vanSkuStepper: {
title: '購買數量', title: '購買數量',
remain: count => `剩餘${count}件`, remain: count => `剩余${count}件`,
quota: quota => `每人限購${quota}件` quota: quota => `每人限購${quota}件`
} }
}; };