From e0210f8219ba8bc38cdda5c8c5680fd728da4200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 16 Jan 2024 11:17:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/permission.js b/src/permission.js index 368af33..49aa04c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -186,7 +186,7 @@ function getInfo(){ router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 var inviteId=queryParams['inviteId'] if(inviteId && !inviteId.startsWith('login')){ - location.replace(getIndexPathUrl(`${baseUrl}#/mdp/tpa/invite/success`,queryParams)) + location.replace(getIndexPathUrl(`${baseUrl}#/invite/success`,queryParams)) }else{ location.replace(getIndexPathUrl(indexPath,{})) } @@ -207,7 +207,7 @@ function getIndexPathUrl(indexPath,queryParams2){ } var queryParams=queryParams2?{...queryParams2}:{} delete queryParams.accessToken - //router.push({path:'/mdp/tpa/invite/success',query:queryParams}) + //router.push({path:'/invite/success',query:queryParams}) var indexQua=indexPath.indexOf("?") var indexUri=""; if(indexQua<0){ From 300cd2d856d2f961a2a4aaec3001712f66f3e274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 16 Jan 2024 11:45:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E6=89=93=E5=BC=80/=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/permission.js b/src/permission.js index 49aa04c..77cc638 100644 --- a/src/permission.js +++ b/src/permission.js @@ -150,13 +150,22 @@ function getQueryVariable(variable,url){ } -function setIndexPath() { +function setIndexPath() { var indexPath=null var url=window.location.href; if(url.indexOf("/login")<=0){ indexPath=url sessionStorage.setItem("index-path",url); - } + }else{ + var idxPath=sessionStorage.getItem("index-path"); + if(idxPath && idxPath!='null'){ + indexPath=idxPath + }else{ + indexPath=url.substring(0,url.indexOf('/login')) + sessionStorage.setItem("index-path",indexPath); + } + + } return indexPath } var indexPath=setIndexPath();