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
c52acc83
Commit
c52acc83
authored
1 year ago
by
徐乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修改
parent
8a668da7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
proxy.js
config/proxy.js
+1
-1
index.js
src/pages/bootpage/index.js
+3
-3
index.js
src/pages/bootpage/integration/index.js
+2
-3
No files found.
config/proxy.js
View file @
c52acc83
/* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn';
const
proxyURL
=
'http://1
92.168.8.27:8023
'
;
const
proxyURL
=
'http://1
20.194.86.66:8096/
'
;
// const proxyURL = 'https://panda-water.cn'
//const proxyURL = 'http://192.168.12.189:8816/'
module
.
exports
=
{
...
...
This diff is collapsed.
Click to expand it.
src/pages/bootpage/index.js
View file @
c52acc83
...
...
@@ -13,7 +13,7 @@ const BootPageTemplate = {
integration
:
IntegrationPage
};
let
first
=
true
;
const
BootPage
=
props
=>
{
const
[
info
,
setInfo
]
=
useState
({
first
:
true
,
...
...
@@ -23,8 +23,8 @@ const BootPage = props => {
const
[
template
,
setTemplate
]
=
useState
(
'default'
);
const
RenderComponent
=
useMemo
(()
=>
{
if
(
window
?.
globalConfig
?.
isIntegration
>=
1
&&
first
)
{
first
=
false
;
if
(
window
?.
globalConfig
?.
isIntegration
>=
1
)
{
//集成登录
return
BootPageTemplate
.
integration
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/pages/bootpage/integration/index.js
View file @
c52acc83
...
...
@@ -55,7 +55,7 @@ const Integration = props => {
config
.
client
=
cli
}
props
.
instance
&&
props
.
instance
.
updateConfig
(
config
);
//
props.instance && props.instance.updateConfig(config);
loginAction
&&
loginAction
.
getUserInfoAndConfig
(
''
,
true
,
item
.
type
,
cli
);
}
};
...
...
@@ -145,8 +145,7 @@ const Integration = props => {
<
/div
>
)}
<
/li
>
),
)
:
''
}
))
:
''
}
<
/ul
>
<
/section
>
<
/div
>
...
...
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