mirror of
https://github.com/youzan/vant.git
synced 2025-10-22 20:04:09 +00:00
Merge branch 'dev' into 2.0
This commit is contained in:
@@ -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;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@@ -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">
|
||||||
|
@@ -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
|
||||||
|
@@ -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' }">
|
||||||
|
Reference in New Issue
Block a user