From e078bc9095297dc744f6c90a22029d5537a3c3e7 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 1 Jan 2019 22:05:47 +0800
Subject: [PATCH] =?UTF-8?q?[new=20feature]=20Card:=20add=20price=E3=80=81n?=
 =?UTF-8?q?um=20slot=20(#2416)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/card/en-US.md                           |  4 +++-
 packages/card/index.vue                          |  6 +++---
 .../card/test/__snapshots__/demo.spec.js.snap    | 16 ++++------------
 packages/card/zh-CN.md                           |  4 +++-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/card/en-US.md b/packages/card/en-US.md
index 28e582a31..69743dbf6 100644
--- a/packages/card/en-US.md
+++ b/packages/card/en-US.md
@@ -63,6 +63,8 @@ Use `slot` to custom content.
 |------|------|
 | title | Custom title |
 | desc | Custom description |
-| tags | Custom tags |
+| num | Custom num |
+| price | Custom price |
 | thumb | Custom thumb |
+| tags | Custom tags |
 | footer | Custom footer |
diff --git a/packages/card/index.vue b/packages/card/index.vue
index aeb3379a0..1e0fc3203 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -49,7 +49,7 @@
           v-if="isDef(price)"
           :class="b('price')"
         >
-          {{ currency }} {{ price }}
+          <slot name="price">{{ currency }} {{ price }}</slot>
         </div>
         <div
           v-if="isDef(originPrice)"
@@ -58,10 +58,10 @@
           {{ currency }} {{ originPrice }}
         </div>
         <div
-          v-if="isDef(num)"
+          v-if="isDef(num) || $slots.num"
           :class="b('num')"
         >
-          x {{ num }}
+          <slot name="num">x {{ num }}</slot>
         </div>
       </div>
     </div>
diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap
index 06eb1c437..8df164a1b 100644
--- a/packages/card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/card/test/__snapshots__/demo.spec.js.snap
@@ -9,13 +9,9 @@ exports[`renders demo correctly 1`] = `
         <div class="van-card__title">2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男</div>
         <div class="van-card__desc van-ellipsis">描述信息</div>
         <div class="van-card__bottom">
-          <div class="van-card__price">
-            ¥ 2.00
-          </div>
+          <div class="van-card__price">¥ 2.00</div>
           <!---->
-          <div class="van-card__num">
-            x 2
-          </div>
+          <div class="van-card__num">x 2</div>
         </div>
       </div>
       <!---->
@@ -34,15 +30,11 @@ exports[`renders demo correctly 1`] = `
           标签2
         </span></div>
         <div class="van-card__bottom">
-          <div class="van-card__price">
-            ¥ 2.00
-          </div>
+          <div class="van-card__price">¥ 2.00</div>
           <div class="van-card__origin-price">
             ¥ 10.00
           </div>
-          <div class="van-card__num">
-            x 2
-          </div>
+          <div class="van-card__num">x 2</div>
         </div>
       </div>
       <div class="van-card__footer">
diff --git a/packages/card/zh-CN.md b/packages/card/zh-CN.md
index 6521d4c7a..2ffdd7862 100644
--- a/packages/card/zh-CN.md
+++ b/packages/card/zh-CN.md
@@ -63,6 +63,8 @@ Vue.use(Card);
 |------|------|
 | title | 自定义标题 |
 | desc | 自定义描述 |
-| tags | 自定义描述下方的内容 |
+| num | 自定义数量 |
+| price | 自定义价格 |
 | thumb | 自定义图片 |
+| tags | 自定义描述下方的内容 |
 | footer | 自定义右下角内容 |