diff --git a/src/api/request.js b/src/api/request.js index 80b605a..5aa410f 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -99,8 +99,8 @@ export async function request(_url, params) { if (response.code !== 200 && response.code !== 0) { console.log('window.location.', window, router) if (response.code === 1000) { - delCookie() - (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({ path: '/login', query: { returnUrl: router.currentRoute.value.fullPath } }) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + router.currentRoute.value.fullPath), '_top') + delCookie(); + (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({ path: '/login', query: { returnUrl: router.currentRoute.value.fullPath } }) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL + encodeURIComponent(window.location.protocol + import.meta.env.VITE_BOE_BASE_URL + import.meta.env.VITE_BASE + router.currentRoute.value.fullPath), '_top') } if (response.code === 2001) { router.push({ path: '/FaceTeachSignUp', query: { courseId: router.currentRoute.value.query.courseId, type: 3 } }) diff --git a/src/api/utils.js b/src/api/utils.js index caa69d6..2929f16 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -6,33 +6,36 @@ * @FilePath: /stu_h5/src/api/utils.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import { watch, ref } from "vue"; -import { boeRequest } from "@/api/request"; -import { GET_USER_LIST } from "@/api/ThirdApi"; +import {watch, ref} from "vue"; +import {boeRequest} from "@/api/request"; +import {GET_USER_LIST} from "@/api/ThirdApi"; export function useImage(src) { - return new URL(`../assets/image/${src}`, import.meta.url).href + return new URL(`../assets/image/${src}`, import.meta.url).href; } export function setCookie(name, value, perpetual) { - const d = new Date() - d.setDate(perpetual * 24 * 60 * 60 * 1000) - document.cookie = `${name}=${value};expires=${d.toGMTString()};path=/` + const d = new Date(); + d.setDate(perpetual * 24 * 60 * 60 * 1000); + document.cookie = `${name}=${value};expires=${d.toGMTString()};path=/`; } export function getCookie(name) { - return document.cookie?.split(";").find(e => e.includes(name))?.replace(`${name}=`, '') || '' + return document.cookie?.split(";").find(e => e.includes(name))?.replace(`${name}=`, "") || ""; } + export function delCookie() { - setCookie("token", "", -1) + setCookie("token", "", -1); + localStorage.removeItem("userInfo"); } + export function useUserInfo(id) { - const userInfo = ref({}) - watch(id, () => { - id.value && boeRequest(GET_USER_LIST, { id: id.value }).then(res => { - userInfo.value = res.result.userInfoList[0] - userInfo.value.avatar = userInfo.value.avatar ? userInfo.value.avatar.includes(import.meta.env.VITE_FILE_PATH) ? userInfo.value.avatar : (import.meta.env.VITE_FILE_PATH + userInfo.value.avatar) : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' - }) - }) - return userInfo + const userInfo = ref({}); + watch(id, () => { + id.value && boeRequest(GET_USER_LIST, { id: id.value }).then(res => { + userInfo.value = res.result.userInfoList[0]; + userInfo.value.avatar = userInfo.value.avatar ? userInfo.value.avatar.includes(import.meta.env.VITE_FILE_PATH) ? userInfo.value.avatar : (import.meta.env.VITE_FILE_PATH + userInfo.value.avatar) : "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png"; + }); + }); + return userInfo; } \ No newline at end of file