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
6d9b183a
Commit
6d9b183a
authored
Sep 19, 2024
by
周宏民
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改集成登录 点击左上角,返回页面错误的问题
parent
debe9adb
Pipeline
#92729
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
index.js
src/pages/bootpage/index.js
+1
-5
index.js
src/pages/bootpage/template/project/mile/index.js
+13
-1
No files found.
src/pages/bootpage/index.js
View file @
6d9b183a
...
...
@@ -35,7 +35,7 @@ const BootPage = props => {
useEffect
(()
=>
{
const
tk
=
Cookies
.
get
(
'token'
)
||
props
.
global
.
token
;
const
isLogin
=
tk
!==
null
&&
tk
!==
'undefined'
&&
tk
!==
void
0
;
let
client
=
props
?.
global
?.
client
||
sessionStorage
.
getItem
(
'client'
)
||
null
;
let
client
=
sessionStorage
.
getItem
(
'client'
)
||
props
?.
global
?.
client
||
null
;
client
=
client
!==
'undefined'
&&
!
_
.
isNull
(
client
)
&&
!
_
.
isUndefined
(
client
)
?
client
:
'city'
;
const
generateType
=
props
.
global
&&
props
.
global
.
hasOwnProperty
(
'get'
)
?
props
.
global
.
get
(
'generateType'
)
:
null
;
if
(
!
isLogin
)
{
...
...
@@ -45,10 +45,6 @@ const BootPage = props => {
}
},
[
props
]);
useEffect
(()
=>
{
if
(
window
?.
globalConfig
?.
isIntegration
>=
1
)
{
setInfo
({
first
:
false
,
loading
:
false
,
error
:
false
});
return
false
;
}
appService
.
GetIntegratedloginSetting
({
ignoreSite
:
true
,
...
...
src/pages/bootpage/template/project/mile/index.js
View file @
6d9b183a
...
...
@@ -60,6 +60,7 @@ const IntegrationMile = props => {
boxHeight
:
930
,
});
const
[
integrationData
,
setIntegrationData
]
=
useState
({});
const
[
logo
,
setLogo
]
=
useState
(
props
.
global
.
logo
);
const
[
linkUrl
,
setLinkUrl
]
=
useState
(
''
);
// 解决 切换 client 时,updateConfig时,页会刷新,loading会重置
...
...
@@ -134,6 +135,17 @@ const IntegrationMile = props => {
}
}
});
const
token
=
props
.
global
?.
token
||
Cookies
.
get
(
'token'
);
const
client
=
sessionStorage
.
getItem
(
'client'
)
||
props
?.
global
?.
client
||
''
;
getWebSiteConfig
({
identity
:
token
,
client
,
})
.
then
(
res
=>
{
const
data
=
res
.
data
?.[
0
]
||
{};
if
(
data
.
logo
)
setLogo
(
data
.
logo
);
})
.
catch
(
err
=>
{});
};
const
onResize
=
()
=>
{
if
(
ref
?.
current
)
{
...
...
@@ -444,7 +456,7 @@ const IntegrationMile = props => {
src={
props.global &&
props.global.transformDevAssetsBaseURL &&
props.global.transformDevAssetsBaseURL(props.global.logo)
props.global.transformDevAssetsBaseURL(
logo ||
props.global.logo)
}
alt="logo"
/>
...
...
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