From 2ce0803ffe7c8fac0ab7306fa72b61b5eb93db63 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 16 Apr 2018 18:01:04 +0800
Subject: [PATCH] [Improvement] SubmitBar: support custom currency symbol
 (#876)

---
 docs/markdown/en-US/card.md       | 1 +
 docs/markdown/en-US/submit-bar.md | 1 +
 docs/markdown/zh-CN/card.md       | 1 +
 docs/markdown/zh-CN/submit-bar.md | 1 +
 packages/card/index.vue           | 8 ++++++--
 packages/submit-bar/index.vue     | 6 +++++-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/markdown/en-US/card.md b/docs/markdown/en-US/card.md
index cb220f30d..7b3785c7b 100644
--- a/docs/markdown/en-US/card.md
+++ b/docs/markdown/en-US/card.md
@@ -49,6 +49,7 @@ Use `slot` to custom content.
 | num | Number of goods | `String | Number` | - | - |
 | price | Price of goods | `String | Number` | - | - |
 | centered | Whether content vertical centered | `String` | `false` | - |
+| currency | Currency symbol |  `String` | `¥` | - |
 
 ### Slot
 
diff --git a/docs/markdown/en-US/submit-bar.md b/docs/markdown/en-US/submit-bar.md
index f8c4d79f9..38e85b370 100644
--- a/docs/markdown/en-US/submit-bar.md
+++ b/docs/markdown/en-US/submit-bar.md
@@ -71,6 +71,7 @@ Use slot to add custom contents.
 | tip | Tip |  `String` | - | - |
 | disabled | Whether to disable button |  `Boolean` | `false` | - |
 | loading | Whether to show loading icon |  `Boolean` | `false` | - |
+| currency | Currency symbol |  `String` | `¥` | - |
 
 ### Event
 
diff --git a/docs/markdown/zh-CN/card.md b/docs/markdown/zh-CN/card.md
index a2897874c..cfdd15612 100644
--- a/docs/markdown/zh-CN/card.md
+++ b/docs/markdown/zh-CN/card.md
@@ -49,6 +49,7 @@ Vue.use(Card);
 | num | 商品数量 | `String | Number` | - | - |
 | price | 商品价格 | `String | Number` | - | - |
 | centered | 内容是否垂直居中 | `String` | `false` | - |
+| currency | 货币符号 |  `String` | `¥` | - |
 
 ### Slot
 
diff --git a/docs/markdown/zh-CN/submit-bar.md b/docs/markdown/zh-CN/submit-bar.md
index f412c5a8e..e7643abbd 100644
--- a/docs/markdown/zh-CN/submit-bar.md
+++ b/docs/markdown/zh-CN/submit-bar.md
@@ -71,6 +71,7 @@ Vue.use(SubmitBar);
 | tip | 提示文案 |  `String` | - | - |
 | disabled | 是否禁用按钮 |  `Boolean` | `false` | - |
 | loading | 是否显示加载中的按钮 |  `Boolean` | `false` | - |
+| currency | 货币符号 |  `String` | `¥` | - |
 
 ### Event
 
diff --git a/packages/card/index.vue b/packages/card/index.vue
index 44dce6230..3f4284f76 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -9,7 +9,7 @@
       <slot name="title">
         <div class="van-card__row" v-if="title || price !== undefined">
           <div v-if="title" class="van-card__title">{{ title }}</div>
-          <div v-if="price !== undefined" class="van-card__price">¥ {{ price }}</div>
+          <div v-if="price !== undefined" class="van-card__price">{{ currency }} {{ price }}</div>
         </div>
       </slot>
       <slot name="desc">
@@ -38,7 +38,11 @@ export default create({
     desc: String,
     centered: Boolean,
     num: [Number, String],
-    price: [Number, String]
+    price: [Number, String],
+    currency: {
+      type: String,
+      default: '¥'
+    }
   }
 });
 </script>
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index a9d236068..f755d4819 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -8,7 +8,7 @@
       <div class="van-submit-bar__price">
         <template v-if="hasPrice">
           <span>{{ label || $t('label') }}</span>
-          <span class="van-submit-bar__price-interger">¥{{ priceInterger }}.</span>
+          <span class="van-submit-bar__price-interger">{{ currency }}{{ priceInterger }}.</span>
           <span class="van-submit-bar__price-decimal">{{ priceDecimal }}</span>
         </template>
       </div>
@@ -38,6 +38,10 @@ export default create({
     loading: Boolean,
     disabled: Boolean,
     buttonText: String,
+    currency: {
+      type: String,
+      default: '¥'
+    },
     buttonType: {
       type: String,
       default: 'danger'