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
7ef05321
Commit
7ef05321
authored
Jun 06, 2023
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 中移免密登录修改
parent
d1cb1de9
Pipeline
#73715
passed with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
login.js
src/pages/user/login/login.js
+5
-3
No files found.
src/pages/user/login/login.js
View file @
7ef05321
...
...
@@ -149,6 +149,7 @@ class Login {
loginName
=
params
.
getParams
(
'loginName'
)
?
params
.
getParams
(
'loginName'
)
:
loginName
;
const
homepage
=
params
.
getParams
(
'homepage'
);
const
generateType
=
params
.
getParams
(
'generateType'
);
const
authCode
=
params
.
getParams
(
'authCode'
);
if
(
window
.
globalConfig
.
loginTemplate
===
'广州登录页'
&&
this
.
props
.
location
.
pathname
.
indexOf
(
'noscret'
)
>
-
1
)
{
self
.
getIpone
().
then
(
v
=>
{
this
.
gzlogin
(
v
.
data
.
userMobile
);
...
...
@@ -176,8 +177,8 @@ class Login {
}
else
if
(
ddCode
&&
loginMode
===
'qywx'
)
{
// 云平台和信息化都有企业微信,得区分(接口定义里面做了判断)
self
.
qywxLoginIn
(
ddCode
);
}
else
if
(
!!
loginName
&&
!!
password
)
{
self
.
otherLoginIn
(
loginName
,
password
);
}
else
if
(
(
!!
loginName
&&
!!
password
)
||
!!
authCode
)
{
self
.
otherLoginIn
(
loginName
,
password
,
authCode
);
}
else
if
(
self
.
globalConfig
.
qrcodeData
&&
(
self
.
globalConfig
.
qrcodeData
.
state
&&
self
.
globalConfig
.
qrcodeData
.
state
===
this
.
redirect_state
)
&&
...
...
@@ -763,7 +764,7 @@ class Login {
});
}
otherLoginIn
(
usr
,
pwd
)
{
otherLoginIn
(
usr
,
pwd
,
code
)
{
// const uesrName = decode(usr.substring(0, usr.length - 3));
// const password = decode(pwd.substring(0, pwd.length - 3));
const
self
=
this
;
...
...
@@ -778,6 +779,7 @@ class Login {
referer
:
this
.
globalConfig
.
client
,
skipMenuTest
:
1
,
generateType
:
params
.
getParams
(
'generateType'
)
||
''
,
authCode
:
code
,
})
.
then
(
response
=>
{
// self.globalConfig.layout = 'blank';
...
...
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