Merge branch 'dev' into next

2020-09-28 11:46:26 +08:00
parent 6cd9e98ce4 6079101958
commit c2d5a18f59
72 changed files with 259 additions and 243 deletions
@@ -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" />