Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
48 changed files with 259 additions and 178 deletions
+1 -1
View File
@@ -52,7 +52,7 @@
</demo-block>
<demo-block :title="t('customColor')">
<van-tabbar v-model="active4" active-color="#07c160" inactive-color="#000">
<van-tabbar v-model="active4" active-color="#ee0a24" inactive-color="#000">
<van-tabbar-item icon="home-o">{{ t('tab') }}</van-tabbar-item>
<van-tabbar-item icon="search">{{ t('tab') }}</van-tabbar-item>
<van-tabbar-item icon="friends-o">{{ t('tab') }}</van-tabbar-item>