diff --git a/src/components/HomeComponents/NavBar.vue b/src/components/HomeComponents/NavBar.vue index 4c25357..cf8806e 100644 --- a/src/components/HomeComponents/NavBar.vue +++ b/src/components/HomeComponents/NavBar.vue @@ -77,6 +77,7 @@ 首页 +
  • @@ -182,29 +183,32 @@ function exitLogin(){ onMounted(() => { requests.userGetProfile(token).then((res)=>{ console.log(res) - if (res.data.code === 200) { - //登录成功 - isLoggedIn.value = true; //头像展示 - username.value = res.data.data.username - // avatar.value = res.data.data.avatar 数据库无头像,暂时用下面的头像 - avatar.value = 'https://img1.baidu.com/it/u=2005056479,139681251&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1710176400&t=4f32b862465c709f79c8fb80d3c0444b'; - console.log(username.value, avatar.value) - if (res.data.data.role === 'teacher') { - console.log('这是老师'); - // 执行老师相关的逻辑 - role.value =true - - } else { - console.log('这不是老师'); - // 执行非老师相关的逻辑 - role.value= false + // if(token ===null){ + // router.push('/') + // } + // else{ + if (res.data.code === 200) { + //登录成功 + isLoggedIn.value = true; //头像展示 + username.value = res.data.data.username + // avatar.value = res.data.data.avatar 数据库无头像,暂时用下面的头像 + avatar.value = 'https://img1.baidu.com/it/u=2005056479,139681251&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1710176400&t=4f32b862465c709f79c8fb80d3c0444b'; + console.log(username.value, avatar.value) + if (res.data.data.role === 'teacher') { + console.log('这是老师'); + // 执行老师相关的逻辑 + role.value =true + } else { + console.log('这不是老师'); + // 执行非老师相关的逻辑 + role.value= false + } + }else { + //用户过期,重新登录 + // message.error("用户过期,请重新登录!") + // router.push("/login") } - - }else{ - //用户过期,重新登录 - message.error("用户过期,请重新登录!") - router.push("/login") - } + // } }) }) diff --git a/src/js/request.js b/src/js/request.js index d79d59e..7cbbdc6 100644 --- a/src/js/request.js +++ b/src/js/request.js @@ -508,7 +508,7 @@ const projectGet =(token) => { return axios({ url:api+ "/project/get", method: "get", - header:{ + headers:{ 'Authorization':'Bearer '+token, 'Timestamp': getCurrentTimestamp() } diff --git a/src/views/ProjectPage/ProjectCard.vue b/src/views/ProjectPage/ProjectCard.vue index dd34ac6..1e2ae6a 100644 --- a/src/views/ProjectPage/ProjectCard.vue +++ b/src/views/ProjectPage/ProjectCard.vue @@ -1,217 +1,66 @@ \ No newline at end of file