diff --git a/frontend/package.json b/frontend/package.json index 33bd221..41cfdfb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "antd-demo", + "name": "electron-egg", "version": "0.1.0", "private": true, "scripts": { diff --git a/frontend/src/assets/logo.png b/frontend/src/assets/logo.png index f3d2503..60eab24 100644 Binary files a/frontend/src/assets/logo.png and b/frontend/src/assets/logo.png differ diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index e3658b4..afda622 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -11,18 +11,6 @@ Router.prototype.push = function push (location, onResolve, onReject) { Vue.use(Router) -// const Foo = { template: '
foo
' } -// const Bar = { template: '
bar
' } -// const constantRouterMap = [ -// { path: '/testa', component: Foo }, -// { path: '/testb', component: Bar } -// ] - -// const constantRouterMap = [ - -// { path: '/testb', component: () => import('@/views/Contentb') } -// ] - export default new Router({ mode: 'history', routes: constantRouterMap diff --git a/frontend/src/views/Layout.vue b/frontend/src/views/Layout.vue index 37774f6..866ca46 100644 --- a/frontend/src/views/Layout.vue +++ b/frontend/src/views/Layout.vue @@ -2,10 +2,11 @@ - - + + @@ -14,7 +15,7 @@ @@ -94,17 +95,26 @@ export default { // 嵌套 #components-layout-demo-responsive { .logo { + border-bottom: 1px solid #e8e8e8; + } + .pic-logo { height: 32px; - background: rgba(139, 137, 137, 0.2); - margin: 16px; - } + //background: rgba(139, 137, 137, 0.2); + margin: 10px; + } + .layout-sider { + border-right: 1px solid #e8e8e8; + } .menu-item { .ant-menu-item { - background-color: #001529; + background-color: #fff; margin-top: 0px; margin-bottom: 0px; } } + .sub-layout-sider { + background-color: #FAFAFA; + } .sub-menu-item { .ant-menu-item { margin-top: 0px;