Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -36,7 +36,7 @@

  <demo-block v-if="!isWeapp" :title="t('customIconColor')">
    <van-action-bar>
-      <van-action-bar-icon icon="chat-o" :text="t('icon1')" color="#07c160" />
+      <van-action-bar-icon icon="chat-o" :text="t('icon1')" color="#ee0a24" />
      <van-action-bar-icon icon="cart-o" :text="t('icon2')" />
      <van-action-bar-icon icon="star" :text="t('collected')" color="#ff5000" />
      <van-action-bar-button type="warning" :text="t('button1')" />