Merge branch '2.x' into dev

src/switch/README.md

@@ -49,7 +49,7 @@ export default {
 ### Custom Color
 
 ```html
-<van-switch v-model="checked" active-color="#07c160" inactive-color="#ee0a24" />
+<van-switch v-model="checked" active-color="#ee0a24" inactive-color="#dcdee0" />
 ```
 
 ### Async Control

src/switch/README.zh-CN.md

@@ -63,7 +63,7 @@ export default {
 `active-color` 属性表示打开时的背景色，`inactive-color` 表示关闭时的背景色。
 
 ```html
-<van-switch v-model="checked" active-color="#07c160" inactive-color="#ee0a24" />
+<van-switch v-model="checked" active-color="#ee0a24" inactive-color="#dcdee0" />
 ```
 
 ### 异步控制

src/switch/demo/index.vue

@@ -18,8 +18,8 @@
   <demo-block :title="t('customColor')">
     <van-switch
       v-model="checked3"
-      active-color="#07c160"
-      inactive-color="#ee0a24"
+      active-color="#ee0a24"
+      inactive-color="#dcdee0"
     />
   </demo-block>
 

src/switch/test/__snapshots__/demo.spec.js.snap

@@ -55,7 +55,7 @@ exports[`should render demo and match snapshot 1`] = `
 <div>
   <div role="switch"
        class="van-switch van-switch--on"
-       style="background-color: rgb(7, 193, 96);"
+       style="background-color: rgb(238, 10, 36);"
        aria-checked="true"
   >
     <div class="van-switch__node">