Merge branch '2.x' into dev

2020-11-01 20:52:07 +08:00
parent 2270dbeddc 7e1ad5dbd5
commit c60b899c42
15 changed files with 993 additions and 31 deletions
@@ -17,7 +17,6 @@

    .van-icon {
      display: block;
-      min-width: 1em;
    }

    img {