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
8144f21f
Commit
8144f21f
authored
Jun 20, 2024
by
周宏民
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 集成登录添加client 配置
parent
7d9155d1
Pipeline
#90016
waiting for manual action with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
Master.js
src/pages/integratedLogin/components/Master.js
+5
-2
login.js
src/pages/user/login/login.js
+3
-0
No files found.
src/pages/integratedLogin/components/Master.js
View file @
8144f21f
...
...
@@ -12,8 +12,6 @@ import {
Select
,
Col
,
Row
,
Cascader
,
Radio
,
AutoComplete
,
InputNumber
,
}
from
'antd'
;
...
...
@@ -80,6 +78,7 @@ const Master = props => {
mapSettings
:
res
.
data
.
mapSettings
,
qrCodename
:
bb
[
0
],
qrCodeurl
:
bb
[
1
],
client
:
res
.
data
.
client
,
});
setKeepSettings
(
res
.
data
.
mapSettings
);
if
(
res
.
data
.
displayMode
===
'卡片'
)
{
...
...
@@ -152,6 +151,7 @@ const Master = props => {
loadingTime: obj.loadingTime,
mapSettings: obj.displayMode === '
卡片
' ? keepSettings : obj.mapSettings,
qrCodeConfig: obj.qrCodename && obj.qrCodeurl && `${obj.qrCodename}|${obj.qrCodeurl}`,
client: obj.client || '
city
',
})
.then(res => {
if (res.code === 0) {
...
...
@@ -389,6 +389,9 @@ const Master = props => {
<Item label="引导页模板" name="displayMode">
<Select placeholder="请选择引导页模板" options={optionsTemp} />
</Item>
<Item label="集成站点" name="client" tooltip="该站点可进入集成登录页,默认为city">
<Input />
</Item>
<Row>
<Col span={8}>
<Item
...
...
src/pages/user/login/login.js
View file @
8144f21f
...
...
@@ -1220,6 +1220,9 @@ class Login {
site
:
_industrySite
||
this
.
getLocalSiteBytoken
(
token
),
ignoreSite
:
true
,
'request.preventCache'
:
Date
.
now
(),
// 获取用户信息添加 client参数,集成登录数量integrated与client相关
client
:
self
?.
global
?.
client
||
sessionStorage
.
getItem
(
'client'
),
// self.globalConfig.userInfo.site ? self.globalConfig.userInfo.site: this.getLocalSiteBytoken(token),
// industrySite ? _industrySite : this.getLocalSiteBytoken(token),
};
...
...
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