diff --git a/packages/card/demo/index.vue b/packages/card/demo/index.vue index d53cdb441..13e30b056 100644 --- a/packages/card/demo/index.vue +++ b/packages/card/demo/index.vue @@ -15,6 +15,7 @@ :title="$t('title')" :desc="$t('desc')" num="2" + :tag="$t('tag')" price="2.00" :thumb="imageURL" > diff --git a/packages/card/en-US.md b/packages/card/en-US.md index ab62999b6..cac65aa92 100644 --- a/packages/card/en-US.md +++ b/packages/card/en-US.md @@ -26,9 +26,10 @@ Use `slot` to custom content. ```html @@ -46,6 +47,7 @@ Use `slot` to custom content. | thumb | Left thumb | `String` | - | | title | Title | `String` | - | | desc | Description | `String` | - | +| tag | Tag | `String` | - | | num | Number of goods | `String | Number` | - | | price | Price of goods | `String | Number` | - | | centered | Whether content vertical centered | `String` | `false` | diff --git a/packages/card/index.vue b/packages/card/index.vue index 4f99ce234..82e13ecdd 100644 --- a/packages/card/index.vue +++ b/packages/card/index.vue @@ -4,6 +4,14 @@ + + {{ tag }} +
@@ -33,9 +41,10 @@ export default create({ name: 'card', props: { + tag: String, + desc: String, thumb: String, title: String, - desc: String, centered: Boolean, num: [Number, String], price: [Number, String], diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap index 9593e4948..5aff35244 100644 --- a/packages/card/test/__snapshots__/demo.spec.js.snap +++ b/packages/card/test/__snapshots__/demo.spec.js.snap @@ -6,6 +6,7 @@ exports[`renders demo correctly 1`] = `
+
@@ -23,8 +24,9 @@ exports[`renders demo correctly 1`] = `
- -
+ + 标签 +
标题
diff --git a/packages/card/zh-CN.md b/packages/card/zh-CN.md index 264e595a2..527873b67 100644 --- a/packages/card/zh-CN.md +++ b/packages/card/zh-CN.md @@ -26,9 +26,10 @@ Vue.use(Card); ```html @@ -46,6 +47,7 @@ Vue.use(Card); | thumb | 左侧图片 | `String` | - | | title | 标题 | `String` | - | | desc | 描述 | `String` | - | +| tag | 标签 | `String` | - | | num | 商品数量 | `String | Number` | - | | price | 商品价格 | `String | Number` | - | | centered | 内容是否垂直居中 | `String` | `false` | diff --git a/packages/vant-css/src/card.css b/packages/vant-css/src/card.css index 132c0cf8a..bab1dd44d 100644 --- a/packages/vant-css/src/card.css +++ b/packages/vant-css/src/card.css @@ -86,6 +86,12 @@ font-size: 12px; } + &__tag { + position: absolute; + top: 2px; + left: 0; + } + &__footer { right: 15px; bottom: 5px;