From a5121e5d4ac84cf65ddb75534a6e23105ad59f40 Mon Sep 17 00:00:00 2001 From: wangxueliang Date: Thu, 25 Jan 2018 15:26:10 +0800 Subject: [PATCH] fix card and routes.js --- components/card/Card.vue | 5 ++--- components/card/demo/basic.vue | 2 +- contributors.md | 2 +- examples/routes.js | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/card/Card.vue b/components/card/Card.vue index 218a2d99a..4c2848d98 100644 --- a/components/card/Card.vue +++ b/components/card/Card.vue @@ -139,8 +139,7 @@ let head const tabs = tabList && tabList.length ? ( - // size='large' Tabs组件暂时未支持 - + {tabList.map(item => )} ) : null @@ -169,7 +168,7 @@ const actions = getComponentFromProp(this, 'actions') const actionDom = actions || null const divProps = omit(others, [ - 'onTabChange', + 'tabChange', ]) return (
diff --git a/components/card/demo/basic.vue b/components/card/demo/basic.vue index 7ad9fa2f2..55f9d0254 100644 --- a/components/card/demo/basic.vue +++ b/components/card/demo/basic.vue @@ -3,7 +3,7 @@ ## 基本 - + More

Card content

Card content

diff --git a/contributors.md b/contributors.md index e0cec9677..537d823d1 100644 --- a/contributors.md +++ b/contributors.md @@ -44,7 +44,7 @@ Pagination | done|select完成后补全 Avatar | done Badge | done Breadcrumb | done -Card +Card | done Collapse LocaleProvider Progress diff --git a/examples/routes.js b/examples/routes.js index cb3c002da..fd184a49a 100644 --- a/examples/routes.js +++ b/examples/routes.js @@ -1,11 +1,11 @@ import Demo from './demo.vue' const AsyncComp = () => { return { - component: import(`../components/card/demo/basic.vue`), + component: import(`../components/button/demo/index.vue`), } } export default [ { path: '/components/:name/:demo?', component: Demo }, - { path: 'test/:name/:demo', component: AsyncComp }, + { path: '/test/:name/:demo?', component: AsyncComp }, { path: '/*', redirect: '/components/menu' }, ]