diff --git a/components/spin/Spin.jsx b/components/spin/Spin.jsx
index b538cb7b3..11f042ce0 100644
--- a/components/spin/Spin.jsx
+++ b/components/spin/Spin.jsx
@@ -41,10 +41,11 @@ export default {
   }),
   data () {
     const { spinning, delay } = this
+    this.debounceTimeout = null
+    this.delayTimeout = null
     return {
       sSpinning: spinning && !shouldDelay(spinning, delay),
-      debounceTimeout: null,
-      delayTimeout: null,
+
     }
   },
   mounted () {
diff --git a/components/steps/index.jsx b/components/steps/index.jsx
index 644108c3a..54fc7f9a8 100644
--- a/components/steps/index.jsx
+++ b/components/steps/index.jsx
@@ -34,13 +34,13 @@ const Steps = {
     const props = getOptionProps(this)
     const { prefixCls } = props
     const icons = {
-      finish: <Icon type='check' className={`${prefixCls}-finish-icon`} />,
-      error: <Icon type='close' className={`${prefixCls}-error-icon`} />,
+      finish: <Icon type='check' class={`${prefixCls}-finish-icon`} />,
+      error: <Icon type='close' class={`${prefixCls}-error-icon`} />,
     }
     const stepsProps = {
       props: {
-        ...props,
         icons,
+        ...props,
       },
       on: this.$listeners,
       scopedSlots: this.$scopedSlots,