tangning hai 8 meses
pai
achega
248873081e
Modificáronse 2 ficheiros con 8 adicións e 4 borrados
  1. 7 3
      src/request/index.ts
  2. 1 1
      src/store/user.ts

+ 7 - 3
src/request/index.ts

@@ -45,13 +45,14 @@ axios.interceptors.request.use(async (config) => {
   }
 
   const { token, userId } = getAuth();
+  let caseId = router.currentRoute.value?.params?.caseId
   console.log("token",getAuth, token, "userId", userId, config.url);
   if (!token && !~notLoginUrls.indexOf(config.url)) {
     // router.replace({ name: RouteName.login });
-    window.location.ref = window.location.origin + "/#/login";
+    let redirect = encodeURIComponent(`${window.location.origin}/mix3d/#/home/${caseId}`);
+    window.location.ref = window.location.origin + "/admin/#/login?redirect=" + redirect;
     throw "用户未登录";
   }
-  let caseId = router.currentRoute.value?.params?.caseId
   config.headers.token = token;
   config.headers['caseid'] = caseId;
   config.headers['page-type'] = 'edit';
@@ -95,7 +96,10 @@ const responseInterceptor = (res: AxiosResponse<any, any>) => {
       ~unAuthCode.indexOf(res.data.code) ||
       errMsg === "token已经失效,请重新登录"
     ) {
-      router.replace({ name: RouteName.login });
+      let caseId = router.currentRoute.value?.params?.caseId
+      let redirect = encodeURIComponent(`${window.location.origin}/mix3d/#/home/${caseId}`);
+      window.location.ref = window.location.origin + "/admin/#/login?redirect=" + redirect;
+      // router.replace({ name: RouteName.login });
       getAuth().clear();
     }
     throw res.data.msg;

+ 1 - 1
src/store/user.ts

@@ -50,7 +50,7 @@ export const getUsers = async (deptId?: string) =>
 // 当前用户的信息
 
 export const user = ref({
-  token: getLocal(`token`, "") || 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjotMSwicm5TdHIiOiJlZ29vMmVJblc1ejRrVkRZbzc5NkpRSHk4SzVoZ2VOUSIsImlkIjoxLCJ1c2VySWQiOjgxNywiaXNBZG1pbiI6MSwicGxhdGZvcm1JZCI6MSwidXNlck5hbWUiOiJzdXBlci1hZG1pbiIsIm5pY2tOYW1lIjoi6LaF57qn566h55CG5ZGYIn0.kkU-OpFExNr0Xyp-n8F-dwPX1IV4szxvUgVACb_oC_A',
+  token: getLocal(`token`, "") || 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjotMSwicm5TdHIiOiI3WFZWVmgzdUVkTmlYSjRyS0czelB4VlRxd3Z6UFVoUSIsImlkIjoxLCJ1c2VySWQiOjgxNywiaXNBZG1pbiI6MSwicGxhdGZvcm1JZCI6MSwidXNlck5hbWUiOiJzdXBlci1hZG1pbiIsIm5pY2tOYW1lIjoi6LaF57qn566h55CG5ZGYIn0.Tw3XhFoUH-4og9FUHhvY0pz3sI-9GB06TfkUOunnl4g',
   info: getLocal("info", {} as UserInfo),
 });