Merge branch '2.x' into dev

src/dropdown-menu/demo/index.vue

@@ -20,12 +20,12 @@
             <van-switch v-model="switch2" size="24" :active-color="RED" />
           </template>
         </van-cell>
-        <div style="padding: 5px 16px;">
+        <div style="padding: 5px 16px">
           <van-button
             type="danger"
             block
             round
-            style="height: 40px;"
+            style="height: 40px"
             @click="onConfirm"
           >
             {{ t('confirm') }}
@@ -36,7 +36,7 @@
   </demo-block>
 
   <demo-block :title="t('customActiveColor')">
-    <van-dropdown-menu :active-color="BLUE">
+    <van-dropdown-menu active-color="#1989fa">
       <van-dropdown-item v-model="value1" :options="option1" />
       <van-dropdown-item v-model="value2" :options="option2" />
     </van-dropdown-menu>
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import { RED, BLUE } from '../../utils/constant';
+import { RED } from '../../utils/constant';
 
 export default {
   i18n: {
@@ -105,7 +105,6 @@ export default {
   data() {
     return {
       RED,
-      BLUE,
       switch1: true,
       switch2: false,
       value1: 0,