linan-0110 5 年之前
父节点
当前提交
b34ecd1cf9
共有 5 个文件被更改,包括 79 次插入30 次删除
  1. 24 15
      src/App.vue
  2. 32 10
      src/router/index.js
  3. 11 0
      src/views/A/Aa.vue
  4. 8 4
      src/views/Home/Home.vue
  5. 4 1
      src/views/Login/Login.vue

+ 24 - 15
src/App.vue

@@ -1,23 +1,32 @@
 <template>
-  <div id="app">
-    <!-- <div id="nav">
-      <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link>
-      <router-link to="/login">login</router-link>
-    </div> -->
-    <router-view />
-  </div>
+    <div id="app">
+        <router-view />
+        <!-- <Login v-if="$route.meta.isLogin"/> -->
+    </div>
 </template>
 
+<script>
+// import Login from "./views/Login/Login";
+export default {
+    components: {
+        // Login
+    },
+    created() {
+      console.log(this.$route.meta)
+    }
+};
+</script>
+
 <style lang="scss">
-#app{
-  height: 100%;
-  margin: 0;
+#app {
+    height: 100%;
+    margin: 0;
 }
-body,html{
+body,
+html {
     height: 100%;
-    width:100%;
-    margin:0 0 0 0;
-    overflow:hidden hidden;
+    width: 100%;
+    margin: 0 0 0 0;
+    overflow: hidden hidden;
 }
 </style>

+ 32 - 10
src/router/index.js

@@ -1,24 +1,46 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
+import App from '../App.vue'
 import Home from '../views/Home/Home.vue'
 import Login from '../views/Login/Login.vue'
+import Aa from '../views/A/Aa.vue'
 
 Vue.use(VueRouter)
 
 const routes = [
-  {
-    path: '/',
-    name: 'login',
-    component: Login
-  }, {
-    path: '/home',
-    name: 'home',
-    component: Home
-  }
+	{
+		path: '/',
+		name: 'app',
+		component: App,
+		children: [
+			{
+				path: '',
+				redirect: '/login'
+			},
+		]
+	},
+	{
+		path: '/login',
+		name: 'login',
+		component: Login
+		
+	},
+	{
+		path: '/home',
+		name: 'home',
+		component: Home,
+		children: [
+			{
+				path: '/aa',
+				name: 'aa',
+				component: Aa
+			}
+		]
+	},
 ]
 
 const router = new VueRouter({
-  routes
+	routes
 })
 
 export default router

+ 11 - 0
src/views/A/Aa.vue

@@ -0,0 +1,11 @@
+<template>
+  <div class="Aa">
+    <h1>Aa ssssssssssssssssss</h1>
+  </div>
+</template>
+<script>
+export default {
+  name: 'Aa'
+}
+</script>
+

+ 8 - 4
src/views/Home/Home.vue

@@ -48,8 +48,10 @@
                     </el-menu>
                 </el-col>
                 <el-col :span="21">
-                    <div class="aa"></div>
-                    <router-view />
+                    <div class="aa">
+                        <router-view />
+                        <!-- <iframe :src="iframeSrc" frameborder="0"></iframe> -->
+                    </div>
                 </el-col>
             </el-row>
         </section>
@@ -69,7 +71,9 @@ export default {
             menuData
         };
     },
-    created() {},
+    created() {
+        console.log(this.$route)
+    },
     mounted() {},
     methods: {
         onSignIn() {},
@@ -85,7 +89,7 @@ export default {
         onClickMenu(e) {
             console.log(e.$attrs.routerName);
             this.$router.push({
-                name: "about"
+                path: "/aa"
             });
         }
     }

+ 4 - 1
src/views/Login/Login.vue

@@ -34,13 +34,16 @@ export default {
             }
         };
     },
+    created() {
+    },
     methods: {
         /* 登录按钮 */
         onSignIn() {
             console.log("登录!");
             console.log(this.form)
+            console.log(this.$route.meta)
             this.$router.push({
-                name: "home"
+                path: "/home"
             });
         }
     },