diff --git a/element-vue/src/pages/teacher/index.vue b/element-vue/src/pages/teacher/index.vue index 6ee0438..240c3e3 100644 --- a/element-vue/src/pages/teacher/index.vue +++ b/element-vue/src/pages/teacher/index.vue @@ -1,16 +1,21 @@ diff --git a/element-vue/src/router.js b/element-vue/src/router.js index 772f484..fcaf59c 100644 --- a/element-vue/src/router.js +++ b/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 } ] diff --git a/element-vue/src/utils/index.js b/element-vue/src/utils/index.js index 4264005..c273cba 100644 --- a/element-vue/src/utils/index.js +++ b/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,21 +17,22 @@ async function request(url, method, data, params, header = {}) { params, method, header, - url: config.host + url, - success: function (res) { - // 0:正常请求 - // -1:错误请求 - if (res.data.code === 0) { - resolve(res.data.data) - } else if (res.data.code === -2) { - reject(res.data) - } else { - reject(res.data) - } - }, - fail(res) { - console.log(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) { + reject(res.data) + } else { + reject(res.data) } + }).catch(res => { + console.log(res) }) }) }