From b204923274420ff0215b73ecad2496ec71184646 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Mon, 17 Dec 2018 21:38:15 +0800
Subject: [PATCH] =?UTF-8?q?[new=20feature]=20Card=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BB=B7=E6=A0=BC=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0demo=20(#2313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/card/demo/index.vue                  | 24 +++++++++++++++----
 packages/card/index.less                      |  2 ++
 .../card/test/__snapshots__/demo.spec.js.snap |  7 +++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/card/demo/index.vue b/packages/card/demo/index.vue
index c2a56787b..6b0bbe894 100644
--- a/packages/card/demo/index.vue
+++ b/packages/card/demo/index.vue
@@ -20,9 +20,13 @@
         :title="$t('title')"
         :thumb="imageURL"
       >
-        <div slot="footer">
-          <van-button size="mini">{{ $t('button') }}</van-button>
-          <van-button size="mini">{{ $t('button') }}</van-button>
+        <div slot="tags" class="card__tags">
+          <van-tag plain type="danger">标签1</van-tag>
+          <van-tag plain type="danger">标签2</van-tag>
+        </div>
+        <div slot="footer" class="card__footer">
+          <van-button round size="mini">{{ $t('button') }}</van-button>
+          <van-button round size="mini">{{ $t('button') }}</van-button>
         </div>
       </van-card>
     </demo-block>
@@ -33,7 +37,7 @@
 export default {
   i18n: {
     'zh-CN': {
-      title: '商品标题'
+      title: '2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男'
     }
   },
 
@@ -44,3 +48,15 @@ export default {
   }
 };
 </script>
+
+<style lang="less">
+  .card__footer {
+    padding-top: 10px;
+  }
+
+  .card__tags {
+    .van-tag {
+      margin-right: 5px;
+    }
+  }
+</style>
diff --git a/packages/card/index.less b/packages/card/index.less
index 29239a082..c49e1a117 100644
--- a/packages/card/index.less
+++ b/packages/card/index.less
@@ -69,6 +69,8 @@
 
   &__price {
     display: inline-block;
+    color: @red;
+    font-weight: bold;
   }
 
   &__origin-price {
diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap
index 768cf0f39..f27d2e555 100644
--- a/packages/card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/card/test/__snapshots__/demo.spec.js.snap
@@ -7,7 +7,7 @@ exports[`renders demo correctly 1`] = `
         <!----></a>
       <div class="van-card__content">
         <div class="van-card__title">
-          商品标题
+          2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男
         </div>
         <div class="van-card__desc van-ellipsis">
           描述信息
@@ -31,11 +31,12 @@ exports[`renders demo correctly 1`] = `
     </span></a>
       <div class="van-card__content">
         <div class="van-card__title">
-          商品标题
+          2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男
         </div>
         <div class="van-card__desc van-ellipsis">
           描述信息
         </div>
+        <div class="card__tags"><span class="van-tag van-tag--plain van-hairline--surround" style="color:#f44;">标签1</span> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#f44;">标签2</span></div>
         <div class="van-card__bottom">
           <div class="van-card__price">
             ¥ 2.00
@@ -49,7 +50,7 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-card__footer">
-        <div><button class="van-button van-button--default van-button--mini"><span class="van-button__text">按钮</span></button> <button class="van-button van-button--default van-button--mini"><span class="van-button__text">按钮</span></button></div>
+        <div class="card__footer"><button class="van-button van-button--default van-button--mini van-button--round"><span class="van-button__text">按钮</span></button> <button class="van-button van-button--default van-button--mini van-button--round"><span class="van-button__text">按钮</span></button></div>
       </div>
     </div>
   </div>