Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-28 11:46:26 +08:00
72 changed files with 259 additions and 243 deletions
+9 -3
View File
@@ -15,19 +15,25 @@ app.use(Loading);
### Type
```html
<van-loading /> <van-loading type="spinner" />
<van-loading />
<van-loading type="spinner" />
```
### Color
```html
<van-loading color="#1989fa" /> <van-loading type="spinner" color="#1989fa" />
<van-loading color="#1989fa" />
<van-loading type="spinner" color="#1989fa" />
```
### Size
```html
<van-loading size="24" /> <van-loading type="spinner" size="24px" />
<van-loading size="24" />
<van-loading type="spinner" size="24px" />
```
### Text