From 0a2cf4bc41baa0f8a8769243e5e9d5a7b592c8be Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 17 Oct 2019 11:45:09 +0800
Subject: [PATCH] fix(Steps): incorrect style when use inactive-icon prop
 (#2166)

---
 packages/steps/index.less |  6 +++---
 packages/steps/index.wxml | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/steps/index.less b/packages/steps/index.less
index 4349b2cd..ab05f462 100644
--- a/packages/steps/index.less
+++ b/packages/steps/index.less
@@ -100,7 +100,7 @@
     &.van-step--process {
       .theme(color, '@text-color');
 
-      .van-step__active {
+      .van-step__icon {
         display: block;
         font-size: 12px;
         line-height: 1;
@@ -134,7 +134,7 @@
       }
     }
 
-    .van-step__active,
+    .van-step__icon,
     .van-step__circle,
     .van-step__line {
       position: absolute;
@@ -144,7 +144,7 @@
       transform: translate3d(-50%, -50%, 0);
     }
 
-    .van-step__active {
+    .van-step__icon {
       font-size: 12px;
       line-height: 1;
     }
diff --git a/packages/steps/index.wxml b/packages/steps/index.wxml
index 9803de50..9e280d87 100644
--- a/packages/steps/index.wxml
+++ b/packages/steps/index.wxml
@@ -13,13 +13,25 @@
       </view>
       <view class="van-step__circle-container">
         <block wx:if="{{ index !== active }}">
-          <van-icon wx:if="{{ inactiveIcon }}" name="{{ inactiveIcon }}" color="#969799" size="12px" />
-          <view wx:else class="van-step__circle" style="{{ index < active ? 'background-color: ' + activeColor : '' }}" />
+          <van-icon
+            wx:if="{{ inactiveIcon }}"
+            color="#969799"
+            name="{{ inactiveIcon }}"
+            custom-class="van-step__icon"
+          />
+          <view
+            wx:else
+            class="van-step__circle"
+            style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+          />
         </block>
 
-        <van-icon wx:else name="{{ activeIcon }}" color="{{ activeColor }}" custom-class="van-step__active" />
+        <van-icon wx:else name="{{ activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" />
       </view>
-      <view wx:if="{{ index !== steps.length - 1 }}" class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}" />
+      <view
+        wx:if="{{ index !== steps.length - 1 }}"
+        class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+      />
     </view>
   </view>
 </view>