From 15375f45236711fe80e3042386c437b8afa5e743 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 31 Aug 2018 10:41:19 +0800 Subject: [PATCH] [breaking change] Sku: no longer support i18n (#1734) --- .../test/__snapshots__/demo.spec.js.snap | 2 +- packages/locale/lang/en-US.js | 44 - packages/locale/lang/zh-CN.js | 46 +- packages/locale/lang/zh-HK.js | 46 +- packages/sku/Sku.vue | 12 +- packages/sku/components/SkuActions.vue | 4 +- packages/sku/components/SkuImgUploader.vue | 12 +- packages/sku/components/SkuMessages.vue | 28 +- packages/sku/components/SkuStepper.vue | 6 +- packages/sku/demo/data.js | 766 ++++++------------ packages/sku/demo/index.vue | 41 +- packages/vant-css/src/sku.css | 8 - 12 files changed, 315 insertions(+), 700 deletions(-) diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap index 71aad8910..4187db50d 100644 --- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap +++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap @@ -8,7 +8,7 @@ exports[`renders demo correctly 1`] = ` -
添加订单联系人信息
+
添加联系人
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js index 36dc06db4..a3b307c37 100644 --- a/packages/locale/lang/en-US.js +++ b/packages/locale/lang/en-US.js @@ -64,49 +64,5 @@ export default { }, vanAddressList: { add: 'Add new address' - }, - vanSku: { - unavailable: 'The product is no longer available for purchase', - spec: 'Please select the goods specification', - least: 'Choose at least one', - quota: quota => `Buy up to ${quota} items`, - inventory: 'Inventory shortage', - purchase: count => `You have purchased ${count} items` - }, - vanSkuActions: { - cart: 'Add to cart', - buy: 'Buy' - }, - vanSkuMessages: { - fill: 'Please fill', - upload: 'Please upload', - number: 'Please fill in the correct number format message', - mobile: 'The length of mobile number must be 6 to 12', - email: 'Please fill in the correct email message', - id_no: 'Please fill in the correct ID number message', - onePic: 'only one picture', - placeholder: { - id_no: 'Idcard Number', - text: 'Text', - tel: 'Number', - email: 'Email', - date: 'Date', - time: 'Time', - textarea: 'Text' - } - }, - vanSkuImgUploader: { - or: 'Or', - uploading: 'Uploading...', - rephoto: 'Take Again', - photo: 'Take', - reselect: 'Reselect', - select: 'Select Photo', - maxSize: maxSize => `The upload limit is up to ${maxSize}MB,please try to compress the photo` - }, - vanSkuStepper: { - title: 'Quantity', - remain: count => `Remain ${count} items`, - quota: quota => `Buy up to ${quota} items` } }; diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index 978dc9b58..ec64b4f0d 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -12,7 +12,7 @@ export default { confirmDelete: '确定要删除么', telInvalid: '请填写正确的电话', vanContactCard: { - addText: '添加订单联系人信息' + addText: '添加联系人' }, vanContactList: { addText: '新建联系人' @@ -64,49 +64,5 @@ export default { }, vanAddressList: { add: '新增地址' - }, - vanSku: { - unavailable: '商品已经无法购买啦', - spec: '请先选择商品规格', - least: '至少选择一件', - quota: quota => `限购${quota}件`, - inventory: '库存不足', - purchase: count => `您已购买${count}件` - }, - vanSkuActions: { - cart: '加入购物车', - buy: '立即购买' - }, - vanSkuMessages: { - fill: '请填写', - upload: '请上传', - number: '请填写正确的数字格式留言', - mobile: '手机号长度为6-20位数字', - email: '请填写正确的邮箱', - id_no: '请填写正确的身份证号码', - onePic: '仅限一张', - placeholder: { - id_no: '输入身份证号码', - text: '输入文本', - tel: '输入数字', - email: '输入邮箱', - date: '点击选择日期', - time: '点击选择时间', - textarea: '点击填写段落文本' - } - }, - vanSkuImgUploader: { - or: '或', - uploading: '正在上传...', - rephoto: '重拍', - photo: '拍照', - reselect: '重新选择照片', - select: '选择照片', - maxSize: maxSize => `最大可上传图片为${maxSize}MB,请尝试压缩图片尺寸` - }, - vanSkuStepper: { - title: '购买数量', - remain: count => `剩余${count}件`, - quota: quota => `每人限购${quota}件` } }; diff --git a/packages/locale/lang/zh-HK.js b/packages/locale/lang/zh-HK.js index b00953d13..73e733519 100644 --- a/packages/locale/lang/zh-HK.js +++ b/packages/locale/lang/zh-HK.js @@ -12,7 +12,7 @@ export default { confirmDelete: '確定要刪除麽', telInvalid: '請填寫正確的電話', vanContactCard: { - addText: '添加訂單聯系人信息' + addText: '添加聯系人' }, vanContactList: { addText: '新建聯系人' @@ -64,49 +64,5 @@ export default { }, vanAddressList: { add: '新增地址' - }, - vanSku: { - unavailable: '商品已經無法購買啦', - spec: '請先選擇商品規格', - least: '至少選擇一件', - quota: quota => `限購${quota}件`, - inventory: '庫存不足', - purchase: count => `您已購買${count}件` - }, - vanSkuActions: { - cart: '加入購物車', - buy: '立即購買' - }, - vanSkuMessages: { - fill: '請填寫', - upload: '請上傳', - number: '請填寫正確的數字格式留言', - mobile: '手機號長度為6-20位數字', - email: '請填寫正確的郵箱', - id_no: '請填寫正確的身份證號碼', - onePic: '僅限一張', - placeholder: { - id_no: '輸入身份證號碼', - text: '輸入文本', - tel: '輸入數字', - email: '輸入郵箱', - date: '點擊選擇日期', - time: '點擊選擇時間', - textarea: '點擊填寫段落文本' - } - }, - vanSkuImgUploader: { - or: '或', - uploading: '正在上傳...', - rephoto: '重拍', - photo: '拍照', - reselect: '重新選擇照片', - select: '選擇照片', - maxSize: maxSize => `最大可上傳圖片為${maxSize}MB,請嘗試壓縮圖片尺寸` - }, - vanSkuStepper: { - title: '購買數量', - remain: count => `剩余${count}件`, - quota: quota => `每人限購${quota}件` } }; diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue index 0da14730e..c59f7fc09 100644 --- a/packages/sku/Sku.vue +++ b/packages/sku/Sku.vue @@ -330,7 +330,7 @@ export default create({ validateSku() { if (this.selectedNum === 0) { - return this.$t('unavailable'); + return '商品已经无法购买啦'; } if (this.isSkuCombSelected) { @@ -343,7 +343,7 @@ export default create({ if (err) return err; } - return this.$t('spec'); + return '请先选择商品规格'; }, onClose() { @@ -378,14 +378,14 @@ export default create({ } if (action === 'minus') { - Toast(this.$t('least')); + Toast('至少选择一件'); } else if (action === 'plus') { if (limitType === QUOTA_LIMIT) { - let msg = this.$t('quota', quota); - if (quotaUsed > 0) msg += `,${this.$t('purchase', quotaUsed)}`; + let msg = `限购${quota}件`; + if (quotaUsed > 0) msg += `,${`您已购买${quotaUsed}件`}`; Toast(msg); } else { - Toast(this.$t('inventory')); + Toast('库存不足'); } } }, diff --git a/packages/sku/components/SkuActions.vue b/packages/sku/components/SkuActions.vue index 427b5b1d3..8ed477bb6 100644 --- a/packages/sku/components/SkuActions.vue +++ b/packages/sku/components/SkuActions.vue @@ -3,13 +3,13 @@ diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue index 0dd253456..6f7998f20 100644 --- a/packages/sku/components/SkuImgUploader.vue +++ b/packages/sku/components/SkuImgUploader.vue @@ -5,15 +5,15 @@ :disabled="!!paddingImg" :after-read="afterReadFile" :max-size="maxSize * 1024 * 1024" - @oversize="$toast($t('maxSize', maxSize))" + @oversize="onOversize" >
-
{{ $t('uploading') }}
+
正在上传...
@@ -84,6 +84,10 @@ export default create({ }).catch(() => { this.paddingImg = ''; }); + }, + + onOversize() { + this.$toast(`最大可上传图片为${this.maxSize}MB,请尝试压缩图片尺寸`); } } }); diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue index aa49f02fa..c73b26b82 100644 --- a/packages/sku/components/SkuMessages.vue +++ b/packages/sku/components/SkuMessages.vue @@ -4,7 +4,7 @@ 18)) { - return this.$t('id_no'); + return '请填写正确的身份证号码'; } } } diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue index 5ba5bd642..cbf597b68 100644 --- a/packages/sku/components/SkuStepper.vue +++ b/packages/sku/components/SkuStepper.vue @@ -1,7 +1,7 @@