From 1a3d6ff4040a946ff1fcb07a42070fceda5b3654 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 13 Sep 2018 19:03:25 +0800
Subject: [PATCH] [bugfix] Tab: color prop (#570)

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

diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml
index 0ecdd50e..ba43a656 100644
--- a/dist/tabs/index.wxml
+++ b/dist/tabs/index.wxml
@@ -12,7 +12,7 @@
           wx:key="index"
           data-index="{{ index }}"
           class="van-tab {{ index === active ? 'van-tab--active' : '' }} {{ item.data.disabled ? 'van-tab--disabled' : '' }}"
-          style="{{ color && !(index === active && type === 'card') && !item.data.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-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 0ecdd50e..ba43a656 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -12,7 +12,7 @@
           wx:key="index"
           data-index="{{ index }}"
           class="van-tab {{ index === active ? 'van-tab--active' : '' }} {{ item.data.disabled ? 'van-tab--disabled' : '' }}"
-          style="{{ color && !(index === active && type === 'card') && !item.data.disabled ? 'color: ' + color : '' }} {{ color && index === active && type === 'card' ? ';background-color:' + color : '' }} {{ color ? ';border-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>