"0430 登陆页面"

element-vue/src/pages/teacher/index.vue

@@ -1,16 +1,21 @@
 <template>
     <div>
-        <nav-bar></nav-bar>
-        <router-view/>
+        <home :names="{ name1:'个人中心', name2:'申请实验室' }"user="林大池"></home>
     </div>
 </template>
 
 <script>
-    import navBar from "~/components/teacher/navBar";
+    import home from "~/components/home";
 
     export default {
         components: {
-            navBar
+            home
+        },
+        methods:{
+            backLogin:function () {
+                this.$router.push('/login')
+                console.log('已退出')
+            }
         }
     }
 </script>

element-vue/src/router.js

@@ -4,8 +4,11 @@ import VueRouter from "vue-router";
 // 引入组件
 import test from "~/pages/test";
 import teacher from "~/pages/teacher/index";
+import manager from "~/pages/manager/index";
+import supManager from "~/pages/supManager/index";
 import personal from "~/pages/teacher/personal";
-import login from "~/components/login";
+import login from "~/pages/login";
+import home from "~/components/home";
 
 // 要告诉 vue 使用 vueRouter
 Vue.use(VueRouter);
@@ -13,11 +16,11 @@ Vue.use(VueRouter);
 const routes = [
     {
         path: "/",
-        redirect: '/home'
+        redirect: '/test'
     },
     {
-        path: "/home",
-        component: test
+      path:'/test',
+        component:test
     },
     {
         path: "/teacher",
@@ -33,9 +36,25 @@ const routes = [
             }
         ]
     },
+    {
+      path:'/manager',
+      component:manager,
+      children:[
+
+      ]
+    },
+    {
+        path:'/supManager',
+        component:supManager
+    },
+
     {
         path:"/login",
         component:login
+    },
+    {
+        path:"/home",
+        component:home
     }
 ]
 

element-vue/src/utils/index.js

@@ -3,11 +3,11 @@ import config from "~/config";
 
 // http get工具函数 获取数据
 export function get(url, params) {
-    return request(url, 'GET', '',params)
+    return request(url, 'GET', '', params)
 }
 
 export function post(url, data) {
-    return request(url, 'POST', data,'')
+    return request(url, 'POST', data, '')
 }
 
 async function request(url, method, data, params, header = {}) {
@@ -17,10 +17,13 @@ async function request(url, method, data, params, header = {}) {
             params,
             method,
             header,
-            url: config.host + url,
-            success: function (res) {
+            url: config.host + url
+        }).then(res => {
+            // 测试期间每个请求都console
+            console.log(res)
             // 0:正常请求
             // -1:错误请求
+            // -2:没有登陆
             if (res.data.code === 0) {
                 resolve(res.data.data)
             } else if (res.data.code === -2) {
@@ -28,10 +31,8 @@ async function request(url, method, data, params, header = {}) {
             } else {
                 reject(res.data)
             }
-            },
-            fail(res) {
+        }).catch(res => {
             console.log(res)
-            }
         })
     })
 }