From bbdf135724e6341d28a96b3d6c19715da6728e58 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 4 Dec 2017 11:32:55 +0800
Subject: [PATCH] [Improvement] CouponCell text adjust (#371)

* [Improvement] CouponCell text adjust

* fix: Coupon test cases

* [bugfix] SubmitBar i18n not work
---
 packages/coupon-cell/index.vue | 28 +++++++++++-----------------
 packages/submit-bar/index.vue  |  3 +++
 test/unit/specs/coupon.spec.js |  4 ++--
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue
index b9a621639..99ed996e5 100644
--- a/packages/coupon-cell/index.vue
+++ b/packages/coupon-cell/index.vue
@@ -1,15 +1,7 @@
 <template>
-  <div class="van-coupon-cell">
-    <van-cell-group>
-      <van-cell :title="title" :isLink="editable" @click="$emit('click')">
-        <div v-if="coupons[chosenCoupon]">
-          <div>{{ coupons[chosenCoupon].name }}</div>
-          <div>{{ coupons[chosenCoupon].condition }}</div>
-        </div>
-        <template v-else>{{ guide }}</template>
-      </van-cell>
-    </van-cell-group>
-  </div>
+  <van-cell-group class="van-coupon-cell">
+    <van-cell :title="title || '优惠券码'" :value="value" :isLink="editable" @click="$emit('click')" />
+  </van-cell-group>
 </template>
 
 <script>
@@ -29,10 +21,7 @@ export default {
   },
 
   props: {
-    title: {
-      type: String,
-      default: '优惠'
-    },
+    title: String,
     coupons: {
       type: Array,
       default: () => []
@@ -48,8 +37,13 @@ export default {
   },
 
   computed: {
-    guide() {
-      return this.coupons.length === 0 ? '使用优惠' : `您有 ${this.coupons.length} 个可用优惠`;
+    value() {
+      const { coupons } = this;
+      const coupon = coupons[this.chosenCoupon];
+      if (coupon) {
+        return `省￥${(coupon.value / 100).toFixed(2)}`;
+      }
+      return coupons.length === 0 ? '使用优惠' : `您有 ${coupons.length} 个可用优惠`;
     }
   }
 };
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index 8efb3e0c5..7188ff3d4 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -21,10 +21,13 @@
 
 <script>
 import Button from '../button';
+import { i18n } from '../locale';
 
 export default {
   name: 'van-submit-bar',
 
+  mixins: [i18n],
+
   components: {
     [Button.name]: Button
   },
diff --git a/test/unit/specs/coupon.spec.js b/test/unit/specs/coupon.spec.js
index 8a6f90cfc..e29b6c397 100644
--- a/test/unit/specs/coupon.spec.js
+++ b/test/unit/specs/coupon.spec.js
@@ -82,7 +82,7 @@ describe('CouponCell', () => {
 
     DOMChecker(wrapper, {
       text: {
-        '.van-cell__value--link div div': '新手专用优惠券'
+        '.van-cell__value--link span': '省￥1.50'
       },
       count: {
         '.van-cell__right-icon': 1
@@ -101,7 +101,7 @@ describe('CouponCell', () => {
 
     DOMChecker(wrapper, {
       text: {
-        '.van-cell__value div div': '新手专用优惠券'
+        '.van-cell__value span': '省￥1.50'
       },
       count: {
         '.van-cell__right-icon': 0