diff --git a/package.json b/package.json index 579d3ae..2a9b024 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "mockjs": "^1.0.1-beta3", "pouchdb": "^7.0.0", "viser-vue": "^2.2.5", - "vue": "^2.5.17", + "vue": "^2.6.10", "vue-router": "^3.0.1", "vuedraggable": "^2.16.0", "vuex": "^3.0.1" @@ -82,7 +82,7 @@ "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", - "vue-template-compiler": "2.5.17", + "vue-template-compiler": "^2.6.10", "webpack": "^3.6.0", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.9.1", diff --git a/src/components/menu/SiderMenu.vue b/src/components/menu/SiderMenu.vue index 4c641d1..053eebf 100644 --- a/src/components/menu/SiderMenu.vue +++ b/src/components/menu/SiderMenu.vue @@ -6,7 +6,7 @@

{{systemName}}

- + @@ -102,4 +102,7 @@ export default { } } } + .menu{ + padding: 16px 0; + } diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js index fe8ce11..31c0e92 100644 --- a/src/components/menu/menu.js +++ b/src/components/menu/menu.js @@ -19,7 +19,7 @@ * ] **/ import Menu from 'ant-design-vue/es/menu' -import Icon from 'ant-design-vue/es/icon/icon' +import Icon from 'ant-design-vue/es/icon/' const {Item, SubMenu} = Menu diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue index b071c2c..d583778 100644 --- a/src/components/page/PageHeader.vue +++ b/src/components/page/PageHeader.vue @@ -59,7 +59,7 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index aa1d2d6..9570f6a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -46,7 +46,7 @@ export default new Router({ children: [ { path: '/dashboard', - name: 'dashboard', + name: 'Dashboard', component: RouteView, icon: 'dashboard', children: [ diff --git a/src/router/lazy.js b/src/router/lazy.js index 7519736..7ddc005 100644 --- a/src/router/lazy.js +++ b/src/router/lazy.js @@ -25,7 +25,7 @@ export default new Router({ children: [ { path: '/dashboard', - name: 'dashboard', + name: 'Dashboard', component: RouteView, icon: 'dashboard', children: [