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 @@
-
-
- {{ item }}
+
+
+ {{ icon }}
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 @@
-
+
{{ info }}