增加zan-layout

2017-03-03 17:58:08 +08:00
parent cead595693
commit e918c52fd0
23 changed files with 337 additions and 124 deletions
@@ -61,17 +61,23 @@ export default {
          'zan-button--' + type,
          'zan-button--' + size,
          {
-            'z-button--disabled': disabled,
-            'z-button--loading': loading,
-            'z-button--block': block
+            'zan-button--disabled': disabled,
+            'zan-button--loading': loading,
+            'zan-button--block': block
          }
        ]}
        onClick={this.handleClick}
      >
        {
-          loading ? <i class="zan-icon-loading"></i> : null
+          loading ?
+            <zan-loading
+              class="zan-button__icon-loading"
+              type="circle"
+              color={type === 'default' ? 'black' : 'white'}>
+            </zan-loading> :
+            null
        }
-        <span class="zan-button-text">{this.$slots.default}</span>
+        <span class="zan-button__text">{this.$slots.default}</span>
      </Tag>
    );
  }