From 39f8c5c5e816005a29b12f5bc5600316c598b0c4 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 6 Sep 2018 17:19:59 +0800
Subject: [PATCH] [bugfix] Tab: color prop not work when use card type (#520)

---
 dist/tabs/index.wxml     | 4 ++--
 packages/tabs/index.wxml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml
index 906d1977..0ecdd50e 100644
--- a/dist/tabs/index.wxml
+++ b/dist/tabs/index.wxml
@@ -5,14 +5,14 @@
       scroll-with-animation
       scroll-left="{{ scrollLeft }}"
     >
-      <view class="van-tabs__nav van-tabs__nav--{{ type }}">
+      <view class="van-tabs__nav van-tabs__nav--{{ type }}" style="{{ color ? 'border-color: ' + color : '' }}">
         <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
         <view
           wx:for="{{ tabs }}"
           wx:key="index"
           data-index="{{ index }}"
           class="van-tab {{ index === active ? 'van-tab--active' : '' }} {{ item.data.disabled ? 'van-tab--disabled' : '' }}"
-          style="{{ color ? 'color: ' + color : '' }}"
+          style="{{ color && !(index === active && type === 'card') && !item.data.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }}"
           bind:tap="onTap"
         >
           <view class="van-ellipsis">{{ item.data.title }}</view>
diff --git a/packages/tabs/index.wxml b/packages/tabs/index.wxml
index 906d1977..0ecdd50e 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -5,14 +5,14 @@
       scroll-with-animation
       scroll-left="{{ scrollLeft }}"
     >
-      <view class="van-tabs__nav van-tabs__nav--{{ type }}">
+      <view class="van-tabs__nav van-tabs__nav--{{ type }}" style="{{ color ? 'border-color: ' + color : '' }}">
         <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
         <view
           wx:for="{{ tabs }}"
           wx:key="index"
           data-index="{{ index }}"
           class="van-tab {{ index === active ? 'van-tab--active' : '' }} {{ item.data.disabled ? 'van-tab--disabled' : '' }}"
-          style="{{ color ? 'color: ' + color : '' }}"
+          style="{{ color && !(index === active && type === 'card') && !item.data.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-color: ' + color : '' }}"
           bind:tap="onTap"
         >
           <view class="van-ellipsis">{{ item.data.title }}</view>