Merge branch 'dev' into next

2020-09-28 11:46:26 +08:00
parent 6cd9e98ce4 6079101958
commit c2d5a18f59
72 changed files with 259 additions and 243 deletions
@@ -37,7 +37,7 @@ export default {

 ### Position

-Use `position` prop to set popup display position
+Use `position` prop to set popup display position.

 ```html
 <van-popup v-model:show="show" position="top" :style="{ height: '30%' }" />
@@ -83,7 +83,7 @@ Use `position` prop to set popup display position

 ### Get Container

-Use `teleport` prop to specify mount location
+Use `teleport` prop to specify mount location.

 ```html
 <!-- mount to body -->