|
@@ -108,9 +108,6 @@ router.beforeEach(async (to, from, next) => {
|
|
|
// 判断当前登录模式,分发处理逻辑
|
|
// 判断当前登录模式,分发处理逻辑
|
|
|
const isNewLoginMode = sessionStorage.getItem('isNewLoginMode') === 'true';
|
|
const isNewLoginMode = sessionStorage.getItem('isNewLoginMode') === 'true';
|
|
|
if (isNewLoginMode) {
|
|
if (isNewLoginMode) {
|
|
|
- if(wxid){
|
|
|
|
|
- window.localStorage.setItem('weChat', JSON.stringify(wxid));
|
|
|
|
|
- }
|
|
|
|
|
await handleWxidLoginMode(to, next, wxid, WecomType);
|
|
await handleWxidLoginMode(to, next, wxid, WecomType);
|
|
|
} else {
|
|
} else {
|
|
|
await handleCodeLoginMode(to, next);
|
|
await handleCodeLoginMode(to, next);
|
|
@@ -130,6 +127,9 @@ router.beforeEach(async (to, from, next) => {
|
|
|
async function handleWxidLoginMode(to, next, wxid, WecomType) {
|
|
async function handleWxidLoginMode(to, next, wxid, WecomType) {
|
|
|
try {
|
|
try {
|
|
|
window.localStorage.setItem('loginMode', 'wxidLogin');
|
|
window.localStorage.setItem('loginMode', 'wxidLogin');
|
|
|
|
|
+ if (wxid) {
|
|
|
|
|
+ window.localStorage.setItem('weChat', JSON.stringify(wxid));
|
|
|
|
|
+ }
|
|
|
if (WecomType) {
|
|
if (WecomType) {
|
|
|
const agentFrom = getAgentFrom(WecomType);
|
|
const agentFrom = getAgentFrom(WecomType);
|
|
|
window.localStorage.setItem('agentFrom', agentFrom);
|
|
window.localStorage.setItem('agentFrom', agentFrom);
|
|
@@ -185,8 +185,8 @@ function handleCodeLoginMode(to, next) {
|
|
|
if (org_loginMode != 'codeLogin') {
|
|
if (org_loginMode != 'codeLogin') {
|
|
|
let weChat = window.localStorage.getItem('weChat');
|
|
let weChat = window.localStorage.getItem('weChat');
|
|
|
window.localStorage.clear();
|
|
window.localStorage.clear();
|
|
|
- if(weChat){
|
|
|
|
|
- window.localStorage.setItem('weChat',weChat);
|
|
|
|
|
|
|
+ if (weChat) {
|
|
|
|
|
+ window.localStorage.setItem('weChat', weChat);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
window.localStorage.setItem('loginMode', 'codeLogin');
|
|
window.localStorage.setItem('loginMode', 'codeLogin');
|