Merge branch 'dev' into 2.0

docs/src/demo-common.js

@@ -96,9 +96,6 @@ export function wrapper(promise, name) {
       Locale.add(formattedI18n);
     }
 
-    component.props = component.props || {};
-    component.props.weapp = Boolean;
-
     return component;
   });
 }

packages/col/demo/index.vue

@@ -36,7 +36,7 @@
     </demo-block>
 
     <demo-block
-      v-if="!weapp"
+      v-if="!$attrs.weapp"
       :title="$t('title3')"
     >
       <van-row type="flex">

packages/rate/demo/index.vue

@@ -23,7 +23,7 @@
     </demo-block>
 
     <demo-block
-      v-if="!weapp"
+      v-if="!$attrs.weapp"
       :title="$t('halfStar')"
     >
       <van-rate

packages/slider/demo/index.vue

@@ -55,7 +55,7 @@
     </demo-block>
 
     <demo-block
-      v-if="!weapp"
+      v-if="!$attrs.weapp"
       :title="$t('vertical')"
     >
       <div :style="{ height: '120px', paddingLeft: '30px' }">