Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
1a5ac404
Commit
1a5ac404
authored
Jun 28, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:解决C端跳转过来闪退到登录页和先进入登录页后进入学院列表的问题
parent
84416698
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
20 deletions
+44
-20
src/index.tsx
+24
-3
src/modules/root/Login.jsx
+20
-17
No files found.
src/index.tsx
View file @
1a5ac404
...
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-04-27 20:35:34
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-2
3 14:14:20
* @LastEditTime: 2021-06-2
8 16:15:59
* @Description:
*/
...
...
@@ -21,6 +21,7 @@ import '@/core/function';
import
'@/core/xmTD'
;
import
User
from
'@/common/js/user'
;
import
Service
from
"@/common/js/service"
;
import
BaseService
from
'@/domains/basic-domain/baseService'
;
declare
var
getParameterByName
:
any
;
declare
var
window
:
any
;
...
...
@@ -71,7 +72,27 @@ if (getParameterByName('code') && isWeiXin()) {
window
.
currentStoreUserInfo
.
enterpriseId
=
res
.
result
.
enterpriseId
;
mount
()
})
}
else
{
}
else
if
(
getParameterByName
(
'from'
)
===
'customer'
&&
getParameterByName
(
'enterpriseId'
)
&&
getParameterByName
(
'userId'
)){
User
.
setCustomerStoreId
(
getParameterByName
(
'storeId'
));
getWXWorkLoginNoCheck
(
getParameterByName
(
'enterpriseId'
),
getParameterByName
(
'userId'
));
//从C端跳转过来的学院自动执行免登录
}
else
{
mount
()
}
function
getWXWorkLoginNoCheck
(
enterpriseId
:
string
,
userId
:
string
)
{
const
params
=
{
appTermEnum
:
'XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN'
,
enterpriseId
,
userId
,
};
BaseService
.
getWXWorkLoginNoCheck
(
params
).
then
((
res
:
any
)
=>
{
User
.
setUserId
(
res
.
result
.
loginInfo
.
userId
)
User
.
setToken
(
res
.
result
.
loginInfo
.
xmToken
)
User
.
setEnterpriseId
(
res
.
result
.
enterpriseId
)
window
.
currentStoreUserInfo
=
{}
window
.
currentStoreUserInfo
.
userId
=
res
.
result
.
loginInfo
.
userId
;
window
.
currentStoreUserInfo
.
token
=
res
.
result
.
loginInfo
.
xmToken
;
window
.
currentStoreUserInfo
.
enterpriseId
=
res
.
result
.
enterpriseId
;
User
.
setIdentifier
(
res
.
result
.
identifier
)
mount
();
});
}
src/modules/root/Login.jsx
View file @
1a5ac404
...
...
@@ -31,26 +31,29 @@ function Login(props) {
*/
useEffect
(()
=>
{
const
enterpriseId
=
getParameterByName
(
'enterpriseId'
);
const
userId
=
getParameterByName
(
'userId'
);
const
from
=
getParameterByName
(
'from'
);
const
storeId
=
getParameterByName
(
'storeId'
);
if
(
storeId
)
{
User
.
setCustomerStoreId
(
storeId
);
}
if
(
from
===
'customer'
&&
enterpriseId
&&
userId
)
{
if
(
!
user
.
getToken
()
||
enterpriseId
!==
user
.
getEnterpriseId
()
||
userId
!==
User
.
getUserId
())
{
getWXWorkLoginNoCheck
(
enterpriseId
,
userId
);
}
else
{
window
.
RCHistory
.
push
({
pathname
:
`/switch-route`
,
});
}
}
else
{
// const enterpriseId = getParameterByName('enterpriseId');
// const userId = getParameterByName('userId');
// const from = getParameterByName('from');
// const storeId = getParameterByName('storeId');
// if (storeId) {
// User.setCustomerStoreId(storeId);
// }
// if (from === 'customer' && enterpriseId && userId) {
// if (!user.getToken() || enterpriseId !== user.getEnterpriseId() || userId !== User.getUserId()) {
// getWXWorkLoginNoCheck(enterpriseId, userId);
// } else {
// window.RCHistory.push({
// pathname: `/switch-route`,
// });
// }
// } else {
// User.removeUserId();
// User.removeToken();
// User.removeEnterpriseId();
// }
User
.
removeUserId
();
User
.
removeToken
();
User
.
removeEnterpriseId
();
}
},
[]);
function
getWXWorkLoginNoCheck
(
enterpriseId
,
userId
)
{
const
params
=
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment