Merge branch '2.x' into dev

2020-11-24 22:21:28 +08:00
parent 12d6b813ea 89ce8345b4
commit 16c3539203
6 changed files with 15 additions and 7 deletions
@@ -3,7 +3,7 @@
    <van-slider v-model="value1" @change="onChange" />
  </demo-block>

-  <demo-block :title="t('title2')">
+  <demo-block v-if="!isWeapp" :title="t('title2')">
    <van-slider range v-model="value2" @change="onChange" />
  </demo-block>

@@ -43,7 +43,7 @@
        v-model="value9"
        range
        vertical
-        style="margin-left: 100px;"
+        style="margin-left: 100px"
        @change="onChange"
      />
    </div>