Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 9e16ad6913, reversing
changes made to 4b3b6cdf16.
This commit is contained in:
yujicun
2023-03-17 17:29:37 +08:00
parent 9e16ad6913
commit f0f86482ac
6 changed files with 53 additions and 62 deletions

View File

@@ -2,14 +2,14 @@ import config from '@/config/index.js'
export function toLogin(ajaxUrl) {
let pageUrl=location.href;
//console.log(pageUrl,'pageUrl');
console.log(pageUrl,'pageUrl');
let urlPre=window.location.protocol+'//'+window.location.host;
//console.log(urlPre,'urlPre');
console.log(urlPre,'urlPre');
let urlContext=config.context;
//console.log(urlContext,'urlContext');
console.log(urlContext,'urlContext');
let returnPage=pageUrl.substring((urlPre+urlContext).length);
//console.log(returnPage,'returnPage');
//console.log(config.loginPath+"?returnUrl="+urlPre+urlContext+'/pages/login/loading?returnUrl='+returnPage,'生成的url');
console.log(returnPage,'returnPage');
console.log(config.loginPath+"?returnUrl="+urlPre+urlContext+'/pages/login/loading?returnUrl='+returnPage,'生成的url');
if(ajaxUrl && ajaxUrl.indexOf('/xboe/portal/init')>-1){
return;