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
1729683c
Commit
1729683c
authored
1 year ago
by
徐乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修改
parent
f478a91c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
BasicLayout.js
src/layouts/BasicLayout.js
+4
-4
index.js
src/pages/bootpage/index.js
+4
-4
No files found.
src/layouts/BasicLayout.js
View file @
1729683c
...
...
@@ -396,7 +396,7 @@ const Layout = props => {
},
[
cityData
,
props
.
global
,
props
.
global
.
userInfo
,
siteAction
]);
useEffect
(()
=>
{
if
(
window
?.
globalConfig
?.
isIntegration
>
1
)
{
if
(
window
?.
globalConfig
?.
isIntegration
>
=
1
)
{
GetIntegrationConfig
();
}
window
.
share
.
event
.
on
(
'updateSite'
,
res
=>
{
...
...
@@ -411,7 +411,7 @@ const Layout = props => {
defaultApp
();
};
if
(
window
?.
globalConfig
?.
isIntegration
>
1
)
{
if
(
window
?.
globalConfig
?.
isIntegration
>
=
1
)
{
loginAction
.
events
.
on
(
'toggleIndustry'
,
handleToggleIndustry
);
}
...
...
@@ -459,7 +459,7 @@ const Layout = props => {
}
const
onMenuHeaderClick
=
event
=>
{
//集成网站
if
(
window
.
globalConfig
.
isIntegration
>
=
1
)
{
if
(
window
.
globalConfig
.
isIntegration
>
1
||
integrationData
.
length
>
1
)
{
// window.qiankunIsCache = false;
history
.
push
(
'/Industry'
);
}
...
...
@@ -654,7 +654,7 @@ const Layout = props => {
popupOffset
:
[
0
,
15
],
}}
headerSiteRender
=
{()
=>
window
?.
globalConfig
?.
isIntegration
>
1
window
?.
globalConfig
?.
isIntegration
>
=
1
?
renderIntegration
(
integrationData
,
loginAction
,
props
)
:
...
...
This diff is collapsed.
Click to expand it.
src/pages/bootpage/index.js
View file @
1729683c
...
...
@@ -13,7 +13,7 @@ const BootPageTemplate = {
integration
:
IntegrationPage
};
let
first
=
true
;
const
BootPage
=
props
=>
{
const
[
info
,
setInfo
]
=
useState
({
first
:
true
,
...
...
@@ -21,10 +21,10 @@ const BootPage = props => {
error
:
false
,
});
const
[
template
,
setTemplate
]
=
useState
(
'default'
);
const
RenderComponent
=
useMemo
(()
=>
{
if
(
window
?.
globalConfig
?.
isIntegration
>=
1
)
{
if
(
window
?.
globalConfig
?.
isIntegration
>=
1
&&
first
)
{
first
=
false
;
//集成登录
return
BootPageTemplate
.
integration
}
else
{
...
...
This diff is collapsed.
Click to expand it.
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