Merge branch 'master' into deploy

2019-02-13 15:11:10 +08:00
parent 10d9007f81 c71f3110fb
commit f1ed620fc2
22 changed files with 279 additions and 138 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -297,13 +297,12 @@ export const asyncRouterMap = [
    path: '/pdf',
    component: Layout,
    redirect: '/pdf/index',
-    meta: { title: 'PDF', icon: 'pdf' },
    children: [
      {
        path: 'index',
        component: () => import('@/views/pdf/index'),
        name: 'PDF',
-        meta: { title: 'PDF' }
+        meta: { title: 'pdf', icon: 'pdf' }
      }
    ]
  },