From 15a9d161085c14252279f6d1ee5676d62185a549 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 16:36:04 +0800
Subject: [PATCH] no message

Former-commit-id: 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 3178255ce8968c40aa21087166fd127bc27e0e44 [formerly 4df003ff6c110b96bb343009751b77f4db59d085] [formerly 4df003ff6c110b96bb343009751b77f4db59d085 [formerly dc2f10a6ddcef909a41abe6380d99ea226cc02b1 [formerly 18517916c243f31ea9ea0689d406722e67734985]]]]]
Former-commit-id: b82633472a6ff1b304cc09bb6307af753f18496c
Former-commit-id: 21c5414edad1ea16dd42a601e7aa474d355004d1
Former-commit-id: 8ff26d026b1286a140252b23dbdc73d6a997f235 [formerly af1884b26233e68da3f480bacd84ff6157c3db2f]
Former-commit-id: 7f69dcb4b1342eed2edba0078318ed68d25ab389
Former-commit-id: 2172557f323fee29dfa7dbb82a44407891a377cb
Former-commit-id: 9dd17bbdfd893a191e44146107e1c8bc96ee831e
Former-commit-id: e70a99d94d3168f687edff37fc09aa0e765797cf
Former-commit-id: 3c5812d062be4250e02addc6757c8976b9b318b8
---
 .../element/basic-color/components/info.vue   | 21 ++++++++++++++++---
 src/pages/demo/element/basic-color/index.vue  |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/pages/demo/element/basic-color/components/info.vue b/src/pages/demo/element/basic-color/components/info.vue
index c0e7cfbc..1f33a070 100644
--- a/src/pages/demo/element/basic-color/components/info.vue
+++ b/src/pages/demo/element/basic-color/components/info.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="info" :class="theme">
-    <p>颜色名称</p>
-    <p>scss名称</p>
-    <p>颜色值</p>
+    <p>{{name}}</p>
+    <p>{{sass}}</p>
+    <p>{{color}}</p>
   </div>
 </template>
 
@@ -13,6 +13,21 @@ export default {
       type: String,
       required: false,
       default: 'light' // dark
+    },
+    name: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    sass: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    color: {
+      type: String,
+      required: false,
+      default: ''
     }
   }
 }
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 6387f87b..03d40bbf 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <div class="color color-primary">
-            <d2-element-basic-color-info/>
+            <d2-element-basic-color-info name="Blue" sass="$color-primary" color="#409EFF"/>
           </div>
         </el-col>
       </el-row>