Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
eeceeadc
Commit
eeceeadc
authored
Dec 09, 2024
by
周宏民
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改关闭集成登录失效的bug
parent
435f09f9
Pipeline
#94473
waiting for manual action with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
login.js
src/pages/user/login/login.js
+7
-6
No files found.
src/pages/user/login/login.js
View file @
eeceeadc
...
...
@@ -381,9 +381,8 @@ class Login {
});
}
if
(
!
flag
&&
this
.
isSignIn
&&
!
window
.
qiankunStarted
)
{
const
item
=
guidePage
.
find
(
g
=>
g
.
value
===
this
.
globalConfig
.
displayMode
);
// 到引导页
if
(
this
.
globalConfig
.
displayMode
!==
'default'
&&
item
)
{
// 到引导页 熊猫演示环境
if
(
this
.
globalConfig
.
displayMode
===
'demonstration'
||
this
.
globalConfig
.
displayMode
===
'panda'
)
{
this
.
createContext
(
this
);
this
.
updateConfig
&&
this
.
updateConfig
(
this
.
globalConfig
);
this
.
events
&&
this
.
events
.
emit
(
'loginIndustry'
);
...
...
@@ -392,6 +391,8 @@ class Login {
// this.globalConfig.isIntegration 为系统配置表里 是否集成登录
// integratedNum 为当前站点配置的集成登录数量,
if
(
this
.
globalConfig
.
isIntegration
>=
1
&&
this
.
integratedNum
>=
2
)
{
this
.
createContext
(
this
);
this
.
updateConfig
&&
this
.
updateConfig
(
this
.
globalConfig
);
this
.
events
&&
this
.
events
.
emit
(
'loginIndustry'
);
return
false
;
}
...
...
@@ -1391,7 +1392,7 @@ class Login {
:
''
,
type
:
mode
,
generateType
:
params
.
getParams
(
'generateType'
)
||
''
,
vcode
:
captcha
vcode
:
captcha
,
})
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
...
...
@@ -1444,7 +1445,6 @@ class Login {
loginName
:
usr
,
generateType
:
params
.
getParams
(
'generateType'
)
||
''
,
vcode
:
captcha
,
})
.
then
(
response
=>
{
if
(
response
?.
msg
===
'密码过期'
)
{
...
...
@@ -1567,7 +1567,8 @@ class Login {
loginHandlerValidate
(
user
,
pwd
,
userPhone
,
isRememberPWD
,
ref
,
validateCode
=
''
)
{
const
self
=
this
;
if
((
this
.
globalConfig
?.
isVerification
||
0
)
*
1
===
1
)
return
self
.
loginValidate
(
user
,
pwd
,
userPhone
,
isRememberPWD
,
SERVICE_APP_LOGIN_MODE
.
password
,
validateCode
);
if
((
this
.
globalConfig
?.
isVerification
||
0
)
*
1
===
1
)
return
self
.
loginValidate
(
user
,
pwd
,
userPhone
,
isRememberPWD
,
SERVICE_APP_LOGIN_MODE
.
password
,
validateCode
);
if
(
user
&&
pwd
)
{
if
(
self
.
loginFailed
&&
self
.
captchaObj
)
{
self
.
captchaObj
.
verify
();
...
...
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