Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-21 18:47:31 +08:00
59 changed files with 277 additions and 264 deletions
+4 -4
View File
@@ -14,7 +14,7 @@ app.use(PullRefresh);
### Basic Usage
The `refresh` event will be triggered when pull refresh, you should set `v-model` to `false` to reset loading status after process refresh event.
The `refresh` event will be Emitted when pull refresh, you should set `v-model` to `false` to reset loading status after process refresh event.
```html
<van-pull-refresh v-model="isLoading" @refresh="onRefresh">
@@ -110,9 +110,9 @@ Use slots to custom tips.
### Events
| Event | Description | Parameters |
| ------- | --------------------------- | ---------- |
| refresh | Triggered when pull refresh | - |
| Event | Description | Parameters |
| ------- | ----------------------------- | ---------- |
| refresh | Emitted after pulling refresh | - |
### Slots