From 737e2df88bec9a0f9b4f52dddf7b1c39950ee0e2 Mon Sep 17 00:00:00 2001
From: BillyWang <181347204@qq.com>
Date: Wed, 28 Mar 2018 22:51:29 +0800
Subject: [PATCH] =?UTF-8?q?*=20Card=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0tit?=
 =?UTF-8?q?le=E5=92=8Cicon=E5=B1=9E=E6=80=A7=EF=BC=8C=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/card/card.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/card/card.vue b/src/components/card/card.vue
index 7dc72ec6..3780e81c 100644
--- a/src/components/card/card.vue
+++ b/src/components/card/card.vue
@@ -1,6 +1,8 @@
 <template>
     <div :class="classes">
-        <div :class="headClasses" v-if="showHead"><slot name="title"></slot></div>
+        <div :class="headClasses" v-if="showHead"><slot name="title">
+            <p v-if="title"><Icon v-if="icon" :type="icon"></Icon>{{title}}</p>
+        </slot></div>
         <div :class="extraClasses" v-if="showExtra"><slot name="extra"></slot></div>
         <div :class="bodyClasses" :style="bodyStyles"><slot></slot></div>
     </div>
@@ -8,10 +10,10 @@
 <script>
     const prefixCls = 'ivu-card';
     const defaultPadding = 16;
-
+    import Icon from '../icon/index'
     export default {
         name: 'Card',
-
+        components: { Icon },
         props: {
             bordered: {
                 type: Boolean,
@@ -28,6 +30,12 @@
             padding: {
                 type: Number,
                 default: defaultPadding
+            },
+            title: {
+                type: String,
+            },
+            icon: {
+                type: String,
             }
         },
         data () {
@@ -67,7 +75,7 @@
             }
         },
         mounted () {
-            this.showHead = this.$slots.title !== undefined;
+            this.showHead = this.title || this.$slots.title !== undefined;
             this.showExtra = this.$slots.extra !== undefined;
         }
     };