Merge branch 'dev' into next

2020-09-05 07:17:49 +08:00
parent 71bae3fcb4 d0eb103cba
commit f19386fe1f
82 changed files with 264 additions and 228 deletions
@@ -86,7 +86,7 @@ import 'vant/lib/icon/local.css';
 | Attribute      | Description             | Type               | Default    |
 | -------------- | ----------------------- | ------------------ | ---------- |
 | name           | Icon name or URL        | _string_           | `''`       |
-| dot `v2.2.1`   | Whether to show red dot | _boolean_          | `false`    |
+| dot            | Whether to show red dot | _boolean_          | `false`    |
 | badge `v2.5.6` | Content of the badge    | _number \| string_ | `''`       |
 | color          | Icon color              | _string_           | `inherit`  |
 | size           | Icon size               | _number \| string_ | `inherit`  |
@@ -92,7 +92,7 @@ import 'vant/lib/icon/local.css';
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | name | 图标名称或图片链接 | _string_ | - |
-| dot `v2.2.1` | 是否显示图标右上角小红点 | _boolean_ | `false` |
+| dot | 是否显示图标右上角小红点 | _boolean_ | `false` |
 | badge `v2.5.6` | 图标右上角徽标的内容 | _number \| string_ | - |
 | color | 图标颜色 | _string_ | `inherit` |
 | size | 图标大小，如 `20px` `2em`，默认单位为`px` | _number \| string_ | `inherit` |