Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -112,7 +112,7 @@ Set `show-confirm` to `false` to hide the confirm button. In this case, the `con
 Use `color` prop to custom calendar color.

 ```html
-<van-calendar v-model:show="show" color="#07c160" />
+<van-calendar v-model:show="show" color="#1989fa" />
 ```

 ### Custom Date Range