提交 66bc4c30 编写于 作者: 辛宝Otto's avatar 辛宝Otto 🥊

Merge branch 'qq_24833847-master-patch-73435' into 'master'

border 属性名重复

See merge request !180
::: tip 组件名:uni-card ::: tip 组件名:uni-card
> 代码块: `uCard` > 代码块: `uCard`
...@@ -97,7 +96,6 @@ ...@@ -97,7 +96,6 @@
|is-full|Boolean|false|卡片内容是否通栏,为true时将去除padding值| |is-full|Boolean|false|卡片内容是否通栏,为true时将去除padding值|
|is-shadow|Boolean|false |卡片内容是否开启阴影| |is-shadow|Boolean|false |卡片内容是否开启阴影|
|shadow|String|0px 0px 3px 1px rgba(0, 0, 0, 0.08) |卡片阴影,需符合 css 值| |shadow|String|0px 0px 3px 1px rgba(0, 0, 0, 0.08) |卡片阴影,需符合 css 值|
|border|Boolean|true |卡片边框|
|margin|String|10px|卡片外边距| |margin|String|10px|卡片外边距|
|spacing|String|10px|卡片内边距| |spacing|String|10px|卡片内边距|
|padding|String|10px|卡片内容内边距| |padding|String|10px|卡片内容内边距|
...@@ -333,4 +331,4 @@ ...@@ -333,4 +331,4 @@
``` ```
::: :::
[完整示例演示](https://hellouniapp.dcloud.net.cn/pages/extUI/card/card) [完整示例演示](https://hellouniapp.dcloud.net.cn/pages/extUI/card/card)
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册