Merge branch 'master' into deploy

2019-04-23 13:06:46 +08:00
parent 1c9723949d 3625f92041
commit 965c2eca65
22 changed files with 130 additions and 49 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -163,7 +163,7 @@ export const asyncRoutes = [
    children: [
      {
        path: 'index',
-        component: () => import('@/views/svg-icons/index'),
+        component: () => import('@/views/icons/index'),
        name: 'Icons',
        meta: { title: 'icons', icon: 'icon', noCache: true }
      }