From 1f5a409112296805b7d903bd11e036de4378d0e4 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 17 Jul 2018 21:21:08 +0800 Subject: [PATCH] [Improvement] CouponCell: optimize text (#1499) --- docs/src/WapApp.vue | 2 +- packages/coupon-cell/index.vue | 2 +- packages/coupon-list/test/__snapshots__/demo.spec.js.snap | 2 +- packages/coupon-list/test/__snapshots__/index.spec.js.snap | 6 +++--- packages/locale/lang/en-US.js | 1 - packages/locale/lang/zh-CN.js | 3 +-- packages/locale/lang/zh-HK.js | 3 +-- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/src/WapApp.vue b/docs/src/WapApp.vue index 2b9ba22d8..ed9347633 100644 --- a/docs/src/WapApp.vue +++ b/docs/src/WapApp.vue @@ -43,7 +43,7 @@ body { color: #333; line-height: 1; background-color: #f8f8f8; - font-family: Arial, Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, sans-serif; + font-family: 'PingFang SC', Helvetica, 'STHeiti STXihei', 'Microsoft YaHei', Tohoma, Arial, sans-serif; -webkit-font-smoothing: antialiased; } diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue index 8aa6de031..58088f50e 100644 --- a/packages/coupon-cell/index.vue +++ b/packages/coupon-cell/index.vue @@ -35,7 +35,7 @@ export default create({ const { coupons } = this; const coupon = coupons[this.chosenCoupon]; if (coupon) { - return `${this.$t('reduce')}¥${(coupon.value / 100).toFixed(2)}`; + return `-¥${(coupon.value / 100).toFixed(2)}`; } return coupons.length === 0 ? this.$t('tips') : this.$t('count', coupons.length); } diff --git a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap index 9d381068f..72f39f565 100644 --- a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap +++ b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap @@ -6,7 +6,7 @@ exports[`renders demo correctly 1`] = `
-
优惠券码 +
优惠券
您有 2 个可用优惠
diff --git a/packages/coupon-list/test/__snapshots__/index.spec.js.snap b/packages/coupon-list/test/__snapshots__/index.spec.js.snap index 3666c1b15..eb66883f1 100644 --- a/packages/coupon-list/test/__snapshots__/index.spec.js.snap +++ b/packages/coupon-list/test/__snapshots__/index.spec.js.snap @@ -4,7 +4,7 @@ exports[`coupon cell 1`] = `
-
优惠券码 +
优惠券
使用优惠
@@ -19,10 +19,10 @@ exports[`coupon cell 2`] = `
-
优惠券码 +
优惠券
-
省¥1.00
+
-¥1.00
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js index 80389e4ca..f123be9d3 100644 --- a/packages/locale/lang/en-US.js +++ b/packages/locale/lang/en-US.js @@ -34,7 +34,6 @@ export default { vanCouponCell: { title: 'Coupon', tips: 'Select coupon', - reduce: 'Reduce', count: count => `You have ${count} offers` }, vanCouponList: { diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index e956b7749..5d3262e3e 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -30,9 +30,8 @@ export default { label: '合计:' }, vanCouponCell: { - title: '优惠券码', + title: '优惠券', tips: '使用优惠', - reduce: '省', count: count => `您有 ${count} 个可用优惠` }, vanCouponList: { diff --git a/packages/locale/lang/zh-HK.js b/packages/locale/lang/zh-HK.js index 5a2e3c2bd..feca06c86 100644 --- a/packages/locale/lang/zh-HK.js +++ b/packages/locale/lang/zh-HK.js @@ -32,9 +32,8 @@ export default { label: '合計:' }, vanCouponCell: { - title: '優惠券碼', + title: '優惠券', tips: '使用優惠', - reduce: '省', count: count => `您有 ${count} 個可用優惠` }, vanCouponList: {