From c059e1ef280b48e43988abf38cbb7ccd39f138a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 30 Jul 2018 16:28:59 +0800
Subject: [PATCH] [breaking change]: Icon: rewrite

---
 example/pages/icon/index.json |  2 +-
 example/pages/icon/index.wxml |  6 +++---
 example/pages/icon/index.wxss | 20 ++++++++++----------
 packages/icon/README.md       |  3 ++-
 packages/icon/index.js        |  1 +
 packages/icon/index.wxml      |  5 ++++-
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/example/pages/icon/index.json b/example/pages/icon/index.json
index 013af28d..5a21cf59 100644
--- a/example/pages/icon/index.json
+++ b/example/pages/icon/index.json
@@ -2,7 +2,7 @@
   "navigationBarTitleText": "Icon 图标",
   "usingComponents": {
     "demo-block": "../../components/demo-block/index",
-    "van-col": "../../dist/icon/index",
+    "van-col": "../../dist/col/index",
     "van-icon": "../../dist/icon/index"
   }
 }
diff --git a/example/pages/icon/index.wxml b/example/pages/icon/index.wxml
index 68cb15ef..b5216160 100644
--- a/example/pages/icon/index.wxml
+++ b/example/pages/icon/index.wxml
@@ -1,6 +1,6 @@
 <demo-block title="图标列表">
-  <van-col span="8" wx:for="{{ icons }}" wx:key="index">
-    <van-icon name="{{ item }}" />
-    <view>{{ item }}</view>
+  <van-col custom-class="col" span="8" wx:for="{{ icons }}" wx:for-item="icon" wx:key="index">
+    <van-icon custom-class="icon" name="{{ icon }}" size="32px" />
+    <view class="text">{{ icon }}</view>
   </van-col>
 </demo-block>
diff --git a/example/pages/icon/index.wxss b/example/pages/icon/index.wxss
index 66308e8c..78a5507c 100644
--- a/example/pages/icon/index.wxss
+++ b/example/pages/icon/index.wxss
@@ -1,17 +1,17 @@
-.icon-wrap {
-  width: 33.33333%;
-  height: 100px;
-  float: left;
+.col {
   text-align: center;
+  height: 100px;
+  float: none;
+  display: inline-block;
+  vertical-align: middle;
 }
 
-.example-icon {
-  font-size: 24px;
-  padding: 10px;
+.icon {
+  display: block;
+  margin: 15px 0;
   color: rgba(69, 90, 100, .8);
 }
 
-.icon-classname {
-  color: #999;
-  font-size: 10px;
+.text {
+  font-size: 14px;
 }
diff --git a/packages/icon/README.md b/packages/icon/README.md
index 1d59ce9f..b5a07e9b 100644
--- a/packages/icon/README.md
+++ b/packages/icon/README.md
@@ -25,7 +25,8 @@
 |-----------|-----------|-----------|-------------|
 | name | 图标名称 | `String` | - |
 | info | 图标右上角文字提示 | `String | Number` | - |
-| color | 图标颜色 | `String` | - |
+| color | 图标颜色 | `String` | `inherit` |
+| size | 图标大小 | `String` | `inherit` |
 
 ### Event
 
diff --git a/packages/icon/index.js b/packages/icon/index.js
index 6bf247ed..295b08d0 100644
--- a/packages/icon/index.js
+++ b/packages/icon/index.js
@@ -4,6 +4,7 @@ Component({
   properties: {
     info: null,
     name: String,
+    size: String,
     color: String
   }
 });
diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
index 863dde1e..7a916cec 100644
--- a/packages/icon/index.wxml
+++ b/packages/icon/index.wxml
@@ -1,3 +1,6 @@
-<view class="custom-class van-icon van-icon-{{ name }}" style="color: {{ color }}">
+<view
+  class="custom-class van-icon van-icon-{{ name }}"
+  style="{{ color ? 'color: ' + color : '' }}; {{ size ? 'font-size: ' + size : '' }}"
+>
   <view wx:if="{{ info !== null }}" class="van-icon__info">{{ info }}</view>
 </view>