Merge branch 'dev' into next

2020-08-15 07:28:06 +08:00
parent 2172cce8b6 272a89423e
commit 472f266c2c
11 changed files with 75 additions and 67 deletions
@@ -22,7 +22,7 @@
        height="55vw"
        :items="simpleItems"
      >
-        <template slot="content">
+        <template #content>
          <van-image
            v-if="activeIndex3 === 0"
            :show-loading="false"