Merge branch '2.x' into dev

src/icon/demo/index.vue

@@ -28,11 +28,11 @@
 
       <demo-block :title="t('color')">
         <van-row>
-          <van-col span="6" @click="copy(demoIcon, { color: BLUE })">
-            <van-icon :name="demoIcon" :color="BLUE" />
+          <van-col span="6" @click="copy(demoIcon, { color: '#1989fa' })">
+            <van-icon name="cart-o" :color="BLUE" />
           </van-col>
-          <van-col span="6" @click="copy(demoIcon, { color: GREEN })">
-            <van-icon :name="demoIcon" :color="GREEN" />
+          <van-col span="6" @click="copy(demoIcon, { color: RED })">
+            <van-icon name="fire-o" :color="RED" />
           </van-col>
         </van-row>
       </demo-block>
@@ -95,7 +95,7 @@
 
 <script>
 import icons from '@vant/icons';
-import { BLUE, GREEN } from '../../utils/constant';
+import { RED } from '../../utils/constant';
 
 // from https://30secondsofcode.org
 function copyToClipboard(str) {
@@ -148,8 +148,7 @@ export default {
   },
 
   data() {
-    this.BLUE = BLUE;
-    this.GREEN = GREEN;
+    this.RED = RED;
     this.icons = icons;
     return {
       tab: 0,