blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-08-07 21:19:45 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into 2.0

Browse Source
This commit is contained in:
陈嘉涵 2019-04-29 14:43:28 +08:00
commit 1c5c5eaf73
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/src/demo-common.js
View File

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

2
packages/col/demo/index.vue
View File

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

2
packages/rate/demo/index.vue
View File

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

2
packages/slider/demo/index.vue
View File

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