ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2026-05-08 01:07:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2020-09-28 11:46:26 +08:00
parent 6cd9e98ce4 6079101958
commit c2d5a18f59
72 changed files with 259 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loading/README.md
+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
src/loading/README.zh-CN.md
+14 -8
View File
@@ -14,31 +14,37 @@ app.use(Loading);
### 加载类型
通过`type`属性可以设置加载图标的类型，默认为`circular`，可选值为`spinner`
通过 `type` 属性可以设置加载图标的类型，默认为 `circular`，可选值为 `spinner`。
```html
<van-loading /> <van-loading type="spinner" />
<van-loading />
<van-loading type="spinner" />
```
### 自定义颜色
通过`color`属性设置加载图标的颜色
通过 `color` 属性设置加载图标的颜色。
```html
<van-loading color="#1989fa" /> <van-loading type="spinner" color="#1989fa" />
<van-loading color="#1989fa" />
<van-loading type="spinner" color="#1989fa" />
```
### 自定义大小
通过`size`属性设置加载图标的大小，默认单位为`px`
通过 `size` 属性设置加载图标的大小，默认单位为 `px`。
```html
<van-loading size="24" /> <van-loading type="spinner" size="24px" />
<van-loading size="24" />
<van-loading type="spinner" size="24px" />
```
### 加载文案
可以使用默认插槽在图标的右侧插入加载文案
可以使用默认插槽在图标的右侧插入加载文案。
```html
<van-loading size="24px">加载中...</van-loading>
@@ -46,7 +52,7 @@ app.use(Loading);
### 垂直排列
设置`vertical`属性后，图标和文案会垂直排列
设置 `vertical` 属性后，图标和文案会垂直排列。
```html
<van-loading size="24px" vertical>加载中...</van-loading>