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
a531419c
Commit
a531419c
authored
Jun 15, 2024
by
周宏民
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改扫码登录
parent
5dde7052
Pipeline
#89850
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
constants.js
src/constants.js
+1
-2
login.js
src/pages/user/login/login.js
+1
-1
index.js
src/pages/user/login/template/cloudNew/index.js
+6
-0
No files found.
src/constants.js
View file @
a531419c
...
...
@@ -25,8 +25,7 @@ export const WECOM_APPID = 'wxec56ca668e7f9155'; // 企业微信APPID
export
const
AGENTID_CLOUD
=
'1000102'
;
// 云平台 agentid
export
const
AGENTID_CRM
=
'1000083'
;
// CRM agentid
export
const
WX_REDIRECT_URI
=
'https://panda-water.com/civbase/user/login'
;
export
const
WX_REDIRECT_URI
=
`
${
window
.
location
?.
host
}
/civbase/
user
/
login
`;
export const SERVICE_INTERFACE_SUCCESS_CODE = 0;
...
...
src/pages/user/login/login.js
View file @
a531419c
...
...
@@ -924,7 +924,7 @@ class Login {
if
(
response
&&
response
.
getMe
&&
response
.
getMe
.
length
)
{
const
tk
=
response
.
getMe
[
0
].
Token
;
self
.
globalConfig
.
token
=
tk
;
Cookies
.
set
(
'token'
,
tk
);
//
Cookies.set('token', tk);
let
url
=
window
.
location
.
href
;
// 获取当前页面的url
if
(
url
.
indexOf
(
'&code'
)
!==
-
1
)
{
// 判断是否存在参数
...
...
src/pages/user/login/template/cloudNew/index.js
View file @
a531419c
...
...
@@ -43,6 +43,12 @@ const Login = forwardRef((props, _ref) => {
let
{
ddCode
}
=
props
.
global
;
const
loginMode
=
Cookies
.
get
(
'loginMode'
)
||
null
;
if
(
loginMode
&&
loginMode
===
'iotWechat'
)
ddCode
=
null
;
if
(
type
===
LOGIN_DISPLAY
.
WeCom
)
{
Cookies
.
set
(
'loginMode'
,
isRQcodeFunc
(
type
)
?
LOGIN_WAY
[
LOGIN_DISPLAY
.
Account
]
:
LOGIN_WAY
[
LOGIN_DISPLAY
.
WeCom
],
{
expires
:
5
*
60
*
1000
,
path
:
'/'
,
});
}
const
handleSubmit
=
values
=>
{
/* eslint-disable */
action
&&
...
...
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