diff --git a/packages/card/en-US.md b/packages/card/en-US.md index caa9bc1c9..3a219fa42 100644 --- a/packages/card/en-US.md +++ b/packages/card/en-US.md @@ -68,5 +68,6 @@ Use slot to custom content. | price | Custom price | | origin-price | Custom origin price | | thumb | Custom thumb | +| tag | Custom thumb tag | | tags | Custom tags | | footer | Custom footer | diff --git a/packages/card/index.js b/packages/card/index.js index 3dfb5ddc9..a3793ac49 100644 --- a/packages/card/index.js +++ b/packages/card/index.js @@ -25,6 +25,7 @@ export default sfc({ const { thumb, $slots: slots } = this; const showThumb = slots.thumb || thumb; + const showTag = slots.tag || this.tag; const showNum = slots.num || isDef(this.num); const showPrice = slots.price || isDef(this.price); const showOriginPrice = slots['origin-price'] || isDef(this.originPrice); @@ -37,10 +38,14 @@ export default sfc({ ) : ( ))} - {this.tag && ( - - {this.tag} - + {showTag && ( +
+ {slots.tag || ( + + {this.tag} + + )} +
)} ); diff --git a/packages/card/test/__snapshots__/demo.spec.js.snap b/packages/card/test/__snapshots__/demo.spec.js.snap index fc8c4eda6..d3628923f 100644 --- a/packages/card/test/__snapshots__/demo.spec.js.snap +++ b/packages/card/test/__snapshots__/demo.spec.js.snap @@ -18,7 +18,9 @@ exports[`renders demo correctly 1`] = `
-
标签 +
+
标签
+
2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男
描述信息
diff --git a/packages/card/zh-CN.md b/packages/card/zh-CN.md index d9d711646..363b8dadf 100644 --- a/packages/card/zh-CN.md +++ b/packages/card/zh-CN.md @@ -49,7 +49,7 @@ Vue.use(Card); | thumb | 左侧图片 URL | `String` | - | - | | title | 标题 | `String` | - | - | | desc | 描述 | `String` | - | - | -| tag | 标签 | `String` | - | 1.3.4 | +| tag | 图片角标 | `String` | - | 1.3.4 | | num | 商品数量 | `String | Number` | - | - | | price | 商品价格 | `String | Number` | - | - | | origin-price | 商品划线原价 | `String | Number` | - | 1.3.6 | @@ -68,5 +68,6 @@ Vue.use(Card); | price | 自定义价格 | | origin-price | 自定义商品原价 | | thumb | 自定义图片 | -| tags | 自定义描述下方的内容 | +| tag | 自定义图片角标 | +| tags | 自定义描述下方标签区域 | | footer | 自定义右下角内容 |