联系电话
+
电话
@@ -96,7 +96,7 @@ exports[`renders demo correctly 1`] = `
联系人：张三
-
联系电话：13000000000
+
电话：13000000000
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index c69b22dd3..eb60f8eae 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -135,7 +135,7 @@ export default create({
buttonDisabled() {
return (
!this.exchangeButtonLoading &&
- (this.exchangeButtonDisabled ||
+ (this.exchangeButtonDisabled || !this.currentCode ||
this.currentCode.length < this.exchangeMinLength)
);
},
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js
index 41d264797..582110761 100644
--- a/packages/locale/lang/en-US.js
+++ b/packages/locale/lang/en-US.js
@@ -9,6 +9,7 @@ export default {
contact: 'Name',
loadingTip: 'Loading...',
nameEmpty: 'Name can not be empty',
+ confirmDelete: 'Are you sure you want to delete?',
telInvalid: 'Malformed phone number',
telPlaceholder: 'Phone',
vanContactCard: {
@@ -17,9 +18,6 @@ export default {
vanContactList: {
addText: 'Add new contact'
},
- vanContactEdit: {
- confirmDelete: 'Are you sure you want to delete this contact?'
- },
vanPagination: {
prev: 'Previous',
next: 'Next'
@@ -52,13 +50,14 @@ export default {
},
vanAddressEdit: {
area: 'Area',
- receiver: 'Receiver',
postal: 'Postal',
areaEmpty: 'Please select a receiving area',
addressEmpty: 'Address can not be empty',
postalEmpty: 'Wrong postal code',
defaultAddress: 'Set as the default address',
- confirmDelete: 'Are you sure you want to delete this address?'
+ telPlaceholder: 'Phone',
+ namePlaceholder: 'Name',
+ areaPlaceholder: 'Area'
},
vanAddressEditDetail: {
label: 'Address',
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index e9326332b..08b02ef57 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -1,6 +1,6 @@
export default {
- name: '名字',
- tel: '联系电话',
+ name: '姓名',
+ tel: '电话',
save: '保存',
confirm: '确认',
cancel: '取消',
@@ -8,9 +8,9 @@ export default {
complete: '完成',
contact: '联系人',
loadingTip: '加载中...',
- nameEmpty: '请填写名字',
+ nameEmpty: '请填写姓名',
confirmDelete: '确定要删除么',
- telInvalid: '请填写正确的联系电话',
+ telInvalid: '请填写正确的电话',
telPlaceholder: '手机或固定电话',
vanContactCard: {
addText: '添加订单联系人信息'
@@ -49,17 +49,19 @@ export default {
condition: (condition) => `满${condition}元可用`
},
vanAddressEdit: {
- area: '收件地区',
- receiver: '收货人',
+ area: '地区',
postal: '邮政编码',
- areaEmpty: '请选择收件地区',
+ areaEmpty: '请选择地区',
addressEmpty: '请填写详细地址',
postalEmpty: '邮政编码格式不正确',
- defaultAddress: '设为默认收货地址'
+ defaultAddress: '设为默认收货地址',
+ telPlaceholder: '收货人手机号',
+ namePlaceholder: '收货人姓名',
+ areaPlaceholder: '选择省 / 市 / 区'
},
vanAddressEditDetail: {
label: '详细地址',
- placeholder: '如街道、楼层、门牌号等'
+ placeholder: '街道门牌、楼层房间号等信息'
},
vanAddressList: {
address: '收货地址',
diff --git a/packages/locale/lang/zh-HK.js b/packages/locale/lang/zh-HK.js
index a7f60b2ae..ea47d90c2 100644
--- a/packages/locale/lang/zh-HK.js
+++ b/packages/locale/lang/zh-HK.js
@@ -1,24 +1,22 @@
export default {
name: '姓名',
- tel: '聯絡電話',
- save: '儲存',
+ tel: '電話',
+ save: '保存',
confirm: '確認',
cancel: '取消',
delete: '刪除',
complete: '完成',
- contact: '聯絡人',
+ contact: '聯系人',
loadingTip: '加載中...',
nameEmpty: '請填寫姓名',
- telInvalid: '請填寫正確的電話號碼',
- telPlaceholder: '電話號碼',
+ confirmDelete: '確定要刪除麽',
+ telInvalid: '請填寫正確的電話',
+ telPlaceholder: '手機或固定電話',
vanContactCard: {
- addText: '添加訂單聯絡人信息'
+ addText: '添加訂單聯系人信息'
},
vanContactList: {
- addText: '新增聯絡人'
- },
- vanContactEdit: {
- confirmDelete: '確定要刪除這個聯絡人嗎'
+ addText: '新建聯系人'
},
vanPagination: {
prev: '上一頁',
@@ -39,6 +37,7 @@ export default {
vanCouponList: {
empty: '暫無優惠券',
exchange: '兌換',
+ close: '不使用優惠',
enable: '可使用優惠券',
disabled: '不可使用優惠券',
placeholder: '請輸入優惠碼'
@@ -50,22 +49,23 @@ export default {
condition: (condition) => `滿${condition}元可用`
},
vanAddressEdit: {
- area: '收件地區',
- receiver: '收貨人',
+ area: '地區',
postal: '郵政編碼',
- areaEmpty: '請選擇收件地區',
+ areaEmpty: '請選擇地區',
addressEmpty: '請填寫詳細地址',
postalEmpty: '郵政編碼格式不正確',
defaultAddress: '設為默認收貨地址',
- confirmDelete: '確定要刪除這個收貨地址麼'
+ telPlaceholder: '收貨人手機號',
+ namePlaceholder: '收貨人姓名',
+ areaPlaceholder: '選擇省 / 市 / 區'
},
vanAddressEditDetail: {
label: '詳細地址',
- placeholder: '如街道、樓層、門牌號等'
+ placeholder: '街道門牌、樓層房間號等信息'
},
vanAddressList: {
address: '收貨地址',
- add: '新增收貨地址'
+ add: '新增地址'
},
vanSku: {
unavailable: '商品已經無法購買啦',
@@ -83,14 +83,14 @@ export default {
fill: '請填寫',
upload: '請上傳',
number: '請填寫正確的數字格式留言',
- email: '請填寫正確的電郵地址',
+ email: '請填寫正確的郵箱',
id_no: '請填寫正確的身份證號碼',
onePic: '僅限一張',
placeholder: {
id_no: '輸入身份證號碼',
text: '輸入文本',
tel: '輸入數字',
- email: '輸入電郵地址',
+ email: '輸入郵箱',
date: '點擊選擇日期',
time: '點擊選擇時間',
textarea: '點擊填寫段落文本'
@@ -107,7 +107,7 @@ export default {
},
vanSkuStepper: {
title: '購買數量',
- remain: count => `剩餘${count}件`,
+ remain: count => `剩余${count}件`,
quota: quota => `每人限購${quota}件`
}
};
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index e724faff2..cdd21e806 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -83,7 +83,7 @@ export default {
beforeDestroy() {
this.close();
-
+
if (this.getContainer) {
this.$parent.$el.appendChild(this.$el);
}