alighasami/vant
1
0
Fork 0
Code Issues Pull Requests 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/progress/README.md
+2 -2
View File
@@ -14,7 +14,7 @@ app.use(Progress);
### Basic Usage
Use 'percentage' prop to set current progress
Use `percentage` prop to set current progress.
```html
<van-progress :percentage="50" />
@@ -34,7 +34,7 @@ Use 'percentage' prop to set current progress
### Custom Style
Use `pivot-text` to custom text，use `color` to custom bar color
Use `pivot-text` to custom text，use `color` to custom bar color.
```html
<van-progress pivot-text="Orange" color="#f2826a" :percentage="25" />
src/progress/README.zh-CN.md
+4 -4
View File
@@ -14,7 +14,7 @@ app.use(Progress);
### 基础用法
进度条默认为蓝色，使用`percentage`属性来设置当前进度
进度条默认为蓝色，使用 `percentage` 属性来设置当前进度。
```html
<van-progress :percentage="50" />
@@ -22,7 +22,7 @@ app.use(Progress);
### 线条粗细
通过`stroke-width`可以设置进度条的粗细
通过 `stroke-width` 可以设置进度条的粗细。
```html
<van-progress :percentage="50" stroke-width="8" />
@@ -30,7 +30,7 @@ app.use(Progress);
### 置灰
设置`inactive`属性后进度条将置灰
设置 `inactive` 属性后进度条将置灰。
```html
<van-progress inactive :percentage="50" />
@@ -38,7 +38,7 @@ app.use(Progress);
### 样式定制
可以使用`pivot-text`属性自定义文字，`color`属性自定义进度条颜色
可以使用 `pivot-text` 属性自定义文字，`color` 属性自定义进度条颜色。
```html
<van-progress pivot-text="橙色" color="#f2826a" :percentage="25" />