From cb85269f174ae0c410a1880330247a4be5629b7c Mon Sep 17 00:00:00 2001
From: Lindy <33708359+Lindysen@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:57:58 +0800
Subject: [PATCH] fix(Tab): fix Card Type Color custome (#2941)

---
 packages/tabs/index.wxml |  2 +-
 packages/tabs/index.wxs  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/tabs/index.wxml b/packages/tabs/index.wxml
index 9e8ca1ac..99ac4118 100644
--- a/packages/tabs/index.wxml
+++ b/packages/tabs/index.wxml
@@ -19,7 +19,7 @@
         class="{{ utils.bem('tabs__scroll', [type]) }}"
         style="{{ color ? 'border-color: ' + color : '' }}"
       >
-        <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class">
+        <view class="{{ utils.bem('tabs__nav', [type]) }} nav-class" style="{{ getters.tabCardTypeBorderStyle(color, type) }}">
           <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
           <view
             wx:for="{{ tabs }}"
diff --git a/packages/tabs/index.wxs b/packages/tabs/index.wxs
index 2b3c5144..88bcafd3 100644
--- a/packages/tabs/index.wxs
+++ b/packages/tabs/index.wxs
@@ -51,6 +51,15 @@ function tabStyle(
   return styles.join(';');
 }
 
+function tabCardTypeBorderStyle(color, type) {
+  var isCard = type === 'card';
+  var styles = [];
+  if (isCard && color) {
+    styles.push('border-color:' + color);
+  }
+  return styles.join(';');
+}
+
 function trackStyle(data) {
   if (!data.animated) {
     return '';
@@ -66,3 +75,4 @@ function trackStyle(data) {
 module.exports.tabClass = tabClass;
 module.exports.tabStyle = tabStyle;
 module.exports.trackStyle = trackStyle;
+module.exports.tabCardTypeBorderStyle = tabCardTypeBorderStyle;