From 47c12a45d25695621466c17cfd9fb7d52ac68c84 Mon Sep 17 00:00:00 2001
From: Fyerl <fyerl@foxmail.com>
Date: Wed, 31 Oct 2018 19:57:37 +0800
Subject: [PATCH] =?UTF-8?q?[improvement]=20Steps:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20(#835)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/steps/index.less b/packages/steps/index.less
index 54eb06bb..875c163f 100644
--- a/packages/steps/index.less
+++ b/packages/steps/index.less
@@ -5,14 +5,21 @@
   background-color: @white;
 
   &--horizontal {
-    position: relative;
-    display: flex;
-    overflow: hidden;
-    padding: 10px 10px 15px;
+    padding: 10px;
+
+    .van-step__wrapper {
+      position: relative;
+      display: flex;
+      overflow: hidden;
+    }
   }
 
   &--vertical {
-    padding: 0 0 0 35px;
+    padding-left: 10px;
+
+    .van-step__wrapper {
+      padding: 0 0 0 20px;
+    }
   }
 }
 
@@ -49,7 +56,7 @@
 
     &:last-child {
       position: absolute;
-      right: 10px;
+      right: 0;
       width: auto;
 
       .van-step__title {
diff --git a/packages/steps/index.wxml b/packages/steps/index.wxml
index 8490bb6b..b323233e 100644
--- a/packages/steps/index.wxml
+++ b/packages/steps/index.wxml
@@ -1,18 +1,20 @@
 <view class="custom-class van-steps van-steps--{{ direction }}">
-  <view
-    wx:for="{{ steps }}"
-    wx:key="index"
-    class="van-step van-hairline van-step--{{ direction }} {{ item.status ? 'van-step--' + item.status : '' }}"
-    style="{{ width ? 'width:' + width + 'px' : '' }}"
-  >
-    <view class="van-step__title" style="{{ item.status === 'process' ? 'color: ' + activeColor : '' }}">
-      <view>{{ item.text }}</view>
-      <view>{{ item.desc }}</view>
+  <view class="van-step__wrapper">
+    <view
+      wx:for="{{ steps }}"
+      wx:key="index"
+      class="van-step van-hairline van-step--{{ direction }} {{ item.status ? 'van-step--' + item.status : '' }}"
+      style="{{ width ? 'width:' + width + 'px' : '' }}"
+    >
+      <view class="van-step__title" style="{{ item.status === 'process' ? 'color: ' + activeColor : '' }}">
+        <view>{{ item.text }}</view>
+        <view>{{ item.desc }}</view>
+      </view>
+      <view class="van-step__circle-container">
+        <view class="van-step__circle" wx:if="{{ item.status !== 'process' }}" style="{{ item.status === 'finish' ? 'background-color: ' + activeColor : '' }}" />
+        <van-icon wx:else name="checked" color="{{ activeColor }}" custom-class="van-step__active" />
+      </view>
+      <view wx:if="{{ index !== steps.length - 1 }}" class="van-step__line" style="{{ item.status === 'finish' ? 'background-color: ' + activeColor : '' }}" />
     </view>
-    <view class="van-step__circle-container">
-      <view class="van-step__circle" wx:if="{{ item.status !== 'process' }}" style="{{ item.status === 'finish' ? 'background-color: ' + activeColor : '' }}" />
-      <van-icon wx:else name="checked" color="{{ activeColor }}" custom-class="van-step__active" />
-    </view>
-    <view wx:if="{{ index !== steps.length - 1 }}" class="van-step__line" style="{{ item.status === 'finish' ? 'background-color: ' + activeColor : '' }}" />
   </view>
 </view>