From 082b7b969348aa1ae4f06b19eb6dcbf9722572a3 Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Wed, 22 Feb 2017 15:57:25 +0800
Subject: [PATCH] Update router

---
 src/App.vue                    | 18 +---------
 src/components/common/Home.vue | 19 ++++++++++
 src/router/index.js            | 66 ++++++++++++++++++----------------
 3 files changed, 56 insertions(+), 47 deletions(-)
 create mode 100644 src/components/common/Home.vue

diff --git a/src/App.vue b/src/App.vue
index 49ce5b1..dedefca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,24 +1,8 @@
 <template>
     <div id="app">
-        <div class="wrapper">
-            <v-head></v-head>
-            <v-sidebar></v-sidebar>
-            <div class="content">
-                <transition name="move" mode="out-in"><router-view></router-view></transition>
-            </div>
-        </div>
+        <router-view></router-view>
     </div>
 </template>
-<script>
-    import header from './components/common/header.vue';
-    import sidebar from './components/common/sidebar.vue';
-    export default {
-        components:{
-            'vHead':header,
-            'vSidebar':sidebar
-        }
-    }
-</script>
 <style>
     @import "../static/css/main.css";
 </style>
\ No newline at end of file
diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue
new file mode 100644
index 0000000..3d119be
--- /dev/null
+++ b/src/components/common/Home.vue
@@ -0,0 +1,19 @@
+<template>
+    <div class="wrapper">
+        <v-head></v-head>
+        <v-sidebar></v-sidebar>
+        <div class="content">
+            <transition name="move" mode="out-in"><router-view></router-view></transition>
+        </div>
+    </div>
+</template>
+
+<script>
+    import vHead from './Header.vue';
+    import vSidebar from './Sidebar.vue';
+    export default {
+        components:{
+            vHead, vSidebar
+        }
+    }
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index c4a371c..536d815 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,36 +6,42 @@ Vue.use(Router);
 export default new Router({
     routes: [
         {
-            path: '/basetable',
-            component: resolve => require(['../components/page/BaseTable.vue'], resolve)
+            path: '/admin',
+            component: resolve => require(['../components/common/Home.vue'], resolve),
+            children:[
+                {
+                    path: '/basetable',
+                    component: resolve => require(['../components/page/BaseTable.vue'], resolve)
+                },
+                {
+                    path: '/vuetable',
+                    component: resolve => require(['../components/page/VueTable.vue'], resolve)
+                },
+                {
+                    path: '/baseform',
+                    component: resolve => require(['../components/page/BaseForm.vue'], resolve)
+                },
+                {
+                    path: '/vueeditor',
+                    component: resolve => require(['../components/page/VueEditor.vue'], resolve)
+                },
+                {
+                    path: '/markdown',
+                    component: resolve => require(['../components/page/Markdown.vue'], resolve)
+                },
+                {
+                    path: '/upload',
+                    component: resolve => require(['../components/page/Upload.vue'], resolve)
+                },
+                {
+                    path: '/basecharts',
+                    component: resolve => require(['../components/page/BaseCharts.vue'], resolve)
+                },
+                {
+                    path: '/mixcharts',
+                    component: resolve => require(['../components/page/MixCharts.vue'], resolve)
+                }
+            ]
         },
-        {
-            path: '/vuetable',
-            component: resolve => require(['../components/page/VueTable.vue'], resolve)
-        },
-        {
-            path: '/baseform',
-            component: resolve => require(['../components/page/BaseForm.vue'], resolve)
-        },
-        {
-            path: '/vueeditor',
-            component: resolve => require(['../components/page/VueEditor.vue'], resolve)
-        },
-        {
-            path: '/markdown',
-            component: resolve => require(['../components/page/Markdown.vue'], resolve)
-        },
-        {
-            path: '/upload',
-            component: resolve => require(['../components/page/Upload.vue'], resolve)
-        },
-        {
-            path: '/basecharts',
-            component: resolve => require(['../components/page/BaseCharts.vue'], resolve)
-        },
-        {
-            path: '/mixcharts',
-            component: resolve => require(['../components/page/MixCharts.vue'], resolve)
-        }
     ]
 })