Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-26 21:05:57 +08:00
21 changed files with 240 additions and 62 deletions

View File

@@ -100,7 +100,7 @@
clickable
:border="false"
column-num="3"
style="width: 240px;"
style="width: 240px"
>
<van-grid-item
v-for="i in 6"
@@ -187,7 +187,7 @@ export default {
disableAction: false,
},
showPicker: false,
currentPlacement: '',
currentPlacement: 'top',
placements: [
'top',
'top-start',