Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
48 changed files with 259 additions and 178 deletions
@@ -67,7 +67,7 @@ exports[`should render demo and match snapshot 1`] = `
>
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
<i class="van-badge__wrapper van-icon van-icon-success"
style="border-color: #07c160; background-color: rgb(7, 193, 96);"
style="border-color: #ee0a24; background-color: rgb(238, 10, 36);"
>
</i>
</div>