From 7c3e2ac7060d7ca8c88ce83ca2048ca01c12c6fb Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Wed, 23 Dec 2020 22:51:50 +0800
Subject: [PATCH] fix(button): fix custom-style error (#3903)

---
 packages/button/index.wxml | 2 +-
 packages/button/index.wxs  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index 1d7db84c..e4cec8ae 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -8,7 +8,7 @@
   hover-class="van-button--active hover-class"
   lang="{{ lang }}"
   form-type="{{ formType }}"
-  style="{{ computed.rootStyle({ plain, color }) }} {{ customStyle }}"
+  style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
   open-type="{{ disabled ? '' : openType }}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
diff --git a/packages/button/index.wxs b/packages/button/index.wxs
index 7bb506a9..8b649fe1 100644
--- a/packages/button/index.wxs
+++ b/packages/button/index.wxs
@@ -3,7 +3,7 @@ var style = require('../wxs/style.wxs');
 
 function rootStyle(data) {
   if (!data.color) {
-    return '';
+    return data.customStyle;
   }
 
   var properties = {
@@ -18,7 +18,7 @@ function rootStyle(data) {
     properties['border-color'] = data.color;
   }
 
-  return style(properties);
+  return style([properties, data.customStyle]);
 }
 
 function loadingColor(data) {