From f17ea3f3131a447c368f05aa3fda1588913edff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Mon, 15 Jan 2018 18:40:14 +0800
Subject: [PATCH] no message

Former-commit-id: 53ff203f46a9e4a9efa4f88137cf7684b6dc7b2f
Former-commit-id: c837c34a1e62860cd1b31a914aa9b4a1a89bfac6
Former-commit-id: 3765b26cbcd41e810f54f5cc3bc386369dfca29d
---
 .../image/logo/header.png.REMOVED.git-id      |  1 +
 src/assets/style/theme/default.scss           | 50 ++++++++++++++++++-
 src/components/core/MainLayout/index.vue      |  3 ++
 src/pages/demo/plugins/papaParse/demo.vue     | 10 ++--
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/image/logo/header.png.REMOVED.git-id

diff --git a/src/assets/image/logo/header.png.REMOVED.git-id b/src/assets/image/logo/header.png.REMOVED.git-id
new file mode 100644
index 00000000..a4453b50
--- /dev/null
+++ b/src/assets/image/logo/header.png.REMOVED.git-id
@@ -0,0 +1 @@
+d39351bf9b78b7abf9eecac82779085241498e19
\ No newline at end of file
diff --git a/src/assets/style/theme/default.scss b/src/assets/style/theme/default.scss
index da461cf9..d8b86ffa 100644
--- a/src/assets/style/theme/default.scss
+++ b/src/assets/style/theme/default.scss
@@ -1,5 +1,7 @@
 @import '~@/assets/style/public.scss';
 
+$color: #409EFF;
+
 // 默认主题
 .layout-main {
   &.default {
@@ -16,13 +18,57 @@
     // [布局]
     .el-header {
       padding: 0px;
+      .logo-group {
+        width: 200px;
+        float: left;
+        text-align: center;
+        img {
+          height: 60px;
+        }
+      }
+      // 顶栏菜单
+      .el-menu {
+        float: left;
+        border-bottom: none;
+        background-color: transparent;
+        .el-menu-item {
+          border-bottom: none;
+          border-top: 2px solid $color-bg;
+          &:hover {
+            background-color: transparent;
+          }
+          &.is-active {
+            border-bottom: none;
+            border-top: 2px solid $color;
+            background-color: transparent;
+          }
+        }
+      }
     }
+    // 顶栏下面
     .el-container {
+      // 侧边栏
       .el-aside {
-        
+        .el-menu {
+          background-color: transparent;
+          .el-menu-item {
+            &:focus {
+              background-color: transparent;
+            }
+            &:hover {
+              background-color: transparent;
+            }
+          }
+          .el-submenu__title {
+            &:hover {
+              background-color: transparent;
+            }
+          }
+        }
       }
       .el-main {
-
+        padding-top: 0px;
+        padding-left: 0px;
       }
     }
   }
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index b3f504cf..d629a936 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -1,6 +1,9 @@
 <template>
   <el-container class="layout-main" :class="theme">
     <el-header>
+      <div class="logo-group">
+        <img src="@/assets/image/logo/header.png">
+      </div>
       <HeaderMenu></HeaderMenu>
     </el-header>
     <el-container>
diff --git a/src/pages/demo/plugins/papaParse/demo.vue b/src/pages/demo/plugins/papaParse/demo.vue
index bf6133fa..705c5e7b 100644
--- a/src/pages/demo/plugins/papaParse/demo.vue
+++ b/src/pages/demo/plugins/papaParse/demo.vue
@@ -10,16 +10,12 @@
         <div class="mb">
           <el-button @click="download">下载演示CSV</el-button>
         </div>
-        <el-upload
-          :before-upload="handleUpload"
-          action="default">
+        <el-upload :before-upload="handleUpload" action="default">
           <el-button type="success">选择本地CSV文件</el-button>
         </el-upload>
       </el-col>
       <el-col :span="20">
-        <el-table
-          v-bind="table"
-          style="width: 100%">
+        <el-table v-bind="table" style="width: 100%">
           <el-table-column
             v-for="(item, index) in table.columns"
             :key="index"
@@ -62,7 +58,7 @@ export default {
       return false
     },
     download () {
-      window.location.href='http://fairyever.qiniudn.com/d2admin-vue-demo.csv'
+      window.location.href = 'http://fairyever.qiniudn.com/d2admin-vue-demo.csv'
     }
   }
 }