Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-12-14 17:07:29 +08:00
11 changed files with 29 additions and 25 deletions
+4 -4
View File
@@ -34,15 +34,15 @@ app.use(NoticeBar);
### Wrapable
```html
<van-notice-bar wrapable :scrollable="false"> Notice Content </van-notice-bar>
<van-notice-bar wrapable :scrollable="false">Notice Content</van-notice-bar>
```
### Mode
```html
<van-notice-bar mode="closeable"> Notice Content </van-notice-bar>
<van-notice-bar mode="closeable">Notice Content</van-notice-bar>
<van-notice-bar mode="link"> Notice Content </van-notice-bar>
<van-notice-bar mode="link">Notice Content</van-notice-bar>
```
### Custom Style
@@ -82,7 +82,7 @@ app.use(NoticeBar);
### Props
| Attribute | Description | Type | Default |
| --- | --- | --- | --- | --- |
| --- | --- | --- | --- |
| mode | Mode, can be set to `closeable` `link` | _string_ | `''` |
| text | Notice text content | _string_ | `''` | - |
| color | Text color | _string_ | `#f60` |
+2 -2
View File
@@ -60,10 +60,10 @@ app.use(NoticeBar);
```html
<!-- closeable 模式,在右侧显示关闭按钮 -->
<van-notice-bar mode="closeable"> 技术是开发它的人的共同灵魂。 </van-notice-bar>
<van-notice-bar mode="closeable">技术是开发它的人的共同灵魂。</van-notice-bar>
<!-- link 模式,在右侧显示链接箭头 -->
<van-notice-bar mode="link"> 技术是开发它的人的共同灵魂。 </van-notice-bar>
<van-notice-bar mode="link">技术是开发它的人的共同灵魂。</van-notice-bar>
```
### 自定义样式