标题
- 
+
```
diff --git a/src/dialog/README.zh-CN.md b/src/dialog/README.zh-CN.md
index 280731986..2a5254420 100644
--- a/src/dialog/README.zh-CN.md
+++ b/src/dialog/README.zh-CN.md
@@ -112,7 +112,7 @@ export default {
title="标题"
show-cancel-button
>
-
+
```
diff --git a/src/dialog/demo/index.vue b/src/dialog/demo/index.vue
index 43485e183..f87cdffc7 100644
--- a/src/dialog/demo/index.vue
+++ b/src/dialog/demo/index.vue
@@ -79,7 +79,7 @@ export default {
return {
show: false,
currentRate: 0,
- image: 'https://img.yzcdn.cn/public_files/2017/09/05/4e3ea0898b1c2c416eec8c11c5360833.jpg'
+ image: 'https://img.yzcdn.cn/vant/apple-3.jpg'
};
},
diff --git a/src/dialog/test/__snapshots__/demo.spec.js.snap b/src/dialog/test/__snapshots__/demo.spec.js.snap
index 4db6952d1..0e32cfd65 100644
--- a/src/dialog/test/__snapshots__/demo.spec.js.snap
+++ b/src/dialog/test/__snapshots__/demo.spec.js.snap
@@ -18,7 +18,7 @@ exports[`renders demo correctly 1`] = `
diff --git a/src/goods-action/README.md b/src/goods-action/README.md
index 30863ed21..bbc9750f1 100644
--- a/src/goods-action/README.md
+++ b/src/goods-action/README.md
@@ -104,7 +104,7 @@ Use `info` prop to show messages in upper right corner of icon
| icon-class | Icon class name | `any` | `''` |
| info | Info message | `String | Number` | - |
| url | Link | `String` | - |
-| to | Target route of the link, same as to of `vue-router` | `String | Object` | - |
+| to | Target route of the link, same as to of vue-router | `String | Object` | - |
| replace | If true, the navigation will not leave a history record | `Boolean` | `false` |
### GoodsActionButton Props
@@ -117,5 +117,5 @@ Use `info` prop to show messages in upper right corner of icon
| disabled | Whether to disable button | `Boolean` | `false` |
| loading | Whether show loading status | `Boolean` | `false` |
| url | Link | `String` | - |
-| to | Target route of the link, same as to of `vue-router` | `String | Object` | - |
+| to | Target route of the link, same as to of vue-router | `String | Object` | - |
| replace | If true, the navigation will not leave a history record | `Boolean` | `false` |
diff --git a/src/goods-action/README.zh-CN.md b/src/goods-action/README.zh-CN.md
index 3d572ccee..7e490b8c5 100644
--- a/src/goods-action/README.zh-CN.md
+++ b/src/goods-action/README.zh-CN.md
@@ -104,7 +104,7 @@ export default {
| icon-class | 图标额外类名 | `any` | - | - |
| info | 图标右上角提示信息 | `String | Number` | - | - |
| url | 跳转链接 | `String` | - | - |
-| to | 路由跳转对象，同 `vue-router` 的 to | `String | Object` | - | - |
+| to | 路由跳转对象，同 vue-router 的 to 属性 | `String | Object` | - | - |
| replace | 跳转时是否替换当前页面历史 | `Boolean` | `false` | - |
### GoodsActionButton Props
@@ -116,5 +116,5 @@ export default {
| disabled | 是否禁用按钮 | `Boolean` | `false` | - | 1.3.10 |
| loading | 是否显示为加载状态 | `Boolean` | `false` | - | 1.3.10 |
| url | 跳转链接 | `String` | - | - |
-| to | 路由跳转对象，同 `vue-router` 的 to | `String | Object` | - | - |
+| to | 路由跳转对象，同 vue-router 的 to 属性 | `String | Object` | - | - |
| replace | 跳转时是否替换当前页面历史 | `Boolean` | `false` | - |
diff --git a/src/grid-item/index.js b/src/grid-item/index.js
new file mode 100644
index 000000000..7c651e3df
--- /dev/null
+++ b/src/grid-item/index.js
@@ -0,0 +1,97 @@
+import { createNamespace, suffixPx } from '../utils';
+import { ChildrenMixin } from '../mixins/relation';
+import { route, routeProps } from '../utils/router';
+import Icon from '../icon';
+
+const [createComponent, bem] = createNamespace('grid-item');
+
+export default createComponent({
+ mixins: [ChildrenMixin('vanGrid')],
+
+ props: {
+ ...routeProps,
+ icon: String,
+ text: String
+ },
+
+ computed: {
+ style() {
+ const { square, gutter, columnNum } = this.parent;
+ const percent = `${100 / columnNum}%`;
+
+ const style = {
+ flexBasis: percent
+ };
+
+ if (square) {
+ style.paddingTop = percent;
+ } else if (gutter) {
+ const gutterValue = suffixPx(gutter);
+ style.paddingRight = gutterValue;
+
+ if (this.index >= columnNum) {
+ style.marginTop = gutterValue;
+ }
+ }
+
+ return style;
+ },
+
+ contentStyle() {
+ const { square, gutter } = this.parent;
+
+ if (square && gutter) {
+ const gutterValue = suffixPx(gutter);
+
+ return {
+ right: gutterValue,
+ bottom: gutterValue,
+ height: 'auto'
+ };
+ }
+ }
+ },
+
+ methods: {
+ onClick(event) {
+ this.$emit('click', event);
+ route(this.$router, this);
+ },
+
+ renderContent() {
+ const slot = this.slots();
+
+ if (slot) {
+ return slot;
+ }
+
+ return [
+ this.slots('icon') || (this.icon && 
+ 
+
+ 
