From 4fdf731a8eac5cf41bcbe3ddc99e2c15d04d84ad Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Fri, 18 Jan 2019 13:18:53 +0800
Subject: [PATCH] feat(Coupon): add new prop condition @rex-zsd (#2551)

---
 packages/coupon-list/demo/index.vue | 2 +-
 packages/coupon-list/en-US.md       | 2 +-
 packages/coupon-list/zh-CN.md       | 4 ++--
 packages/coupon/index.js            | 2 +-
 packages/coupon/index.less          | 7 ++++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/coupon-list/demo/index.vue b/packages/coupon-list/demo/index.vue
index 7ad933af0..75c09eb58 100644
--- a/packages/coupon-list/demo/index.vue
+++ b/packages/coupon-list/demo/index.vue
@@ -67,7 +67,7 @@ export default {
         id: 1,
         discount: 0,
         denominations: 150,
-        originCondition: 0,
+        condition: '无使用门槛\n最多优惠12元',
         reason: '',
         value: 150,
         name: this.$t('coupon.name'),
diff --git a/packages/coupon-list/en-US.md b/packages/coupon-list/en-US.md
index 963fec6c8..e4b4ed74e 100644
--- a/packages/coupon-list/en-US.md
+++ b/packages/coupon-list/en-US.md
@@ -108,7 +108,7 @@ export default {
 | name | Name | `String` |
 | discount | Discount | `Number` |
 | denominations | Denominations | `Number` |
-| originCondition | Condition | `Number` |
+| condition | Condition | `String` |
 | startAt | Start time (Timestmap, unit second) | `Number` |
 | endAt | End time (Timestmap, unit second) | `Number` |
 | description | Description | `String` |
diff --git a/packages/coupon-list/zh-CN.md b/packages/coupon-list/zh-CN.md
index 0d75f96c5..42cb6fed5 100644
--- a/packages/coupon-list/zh-CN.md
+++ b/packages/coupon-list/zh-CN.md
@@ -36,7 +36,7 @@ const coupon = {
   available: 1,
   discount: 0,
   denominations: 150,
-  originCondition: 0,
+  condition: '无使用门槛\n最多优惠12元',
   reason: '',
   value: 150,
   name: '优惠券名称',
@@ -113,7 +113,7 @@ export default {
 | name | 优惠券名称 | `String` |
 | discount | 折扣（0为满减券）88=>8.8折 | `Number` |
 | denominations | 面值（0为折扣券）单位分 | `Number` |
-| originCondition | 满减条件（0为无门槛，满XX元可用）单位分 | `Number` |
+| condition | 满减条件 | `String` |
 | startAt | 卡有效开始时间 (时间戳, 单位秒) | `Number` |
 | endAt | 卡失效日期 (时间戳, 单位秒) | `Number` |
 | description | 描述信息，优惠券可用时展示 | `String` |
diff --git a/packages/coupon/index.js b/packages/coupon/index.js
index e61e8ae03..fdee528e4 100644
--- a/packages/coupon/index.js
+++ b/packages/coupon/index.js
@@ -60,7 +60,7 @@ export default sfc({
         <div class={bem('content')}>
           <div class={bem('head')}>
             <h2 domPropsInnerHTML={this.faceAmount} />
-            <p>{this.conditionMessage}</p>
+            <p>{this.coupon.condition || this.conditionMessage}</p>
           </div>
           <div class={bem('body')}>
             <h2>{coupon.name}</h2>
diff --git a/packages/coupon/index.less b/packages/coupon/index.less
index 55b2f79e9..ea4c18d3c 100644
--- a/packages/coupon/index.less
+++ b/packages/coupon/index.less
@@ -39,7 +39,8 @@
   }
 
   &__head {
-    min-width: 90px;
+    position: relative;
+    min-width: 95px;
 
     h2 {
       color: @red;
@@ -49,6 +50,10 @@
         font-size: 50%;
       }
     }
+
+    p {
+      white-space: pre-wrap;
+    }
   }
 
   &__body {