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
99535258
Commit
99535258
authored
3 years ago
by
李纪文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 首页跳转问题
parent
45021e11
Pipeline
#42006
passed with stages
in 1 minute 36 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
8 deletions
+22
-8
reducer.js
src/containers/App/store/reducer.js
+1
-0
micro.js
src/micro.js
+13
-6
login.js
src/pages/user/login/login.js
+8
-2
No files found.
src/containers/App/store/reducer.js
View file @
99535258
...
...
@@ -94,6 +94,7 @@ const appReducer = (state = initialState, action) => {
window
.
__INITIAL_STATE__
.
mdi
=
'SDI'
;
window
.
__INITIAL_STATE__
.
menu
=
'banner-left'
;
window
.
globalConfig
=
AppConfig
(
window
.
__INITIAL_STATE__
);
window
.
globalConfig
.
productType
=
'civweb4'
;
// eslint-disable-next-line no-undef
createStoreage
.
set
(
'globalConfig'
,
window
.
globalConfig
);
// eslint-disable-next-line no-undef,no-case-declarations
...
...
This diff is collapsed.
Click to expand it.
src/micro.js
View file @
99535258
...
...
@@ -211,13 +211,20 @@ export const defaultApp = () => {
const
config
=
createStoreage
.
get
(
'globalConfig'
);
if
(
config
&&
config
.
token
)
{
const
basePath
=
config
.
homepage
!==
''
&&
FILTER_FOLER_REG
.
test
(
config
.
homepage
)
?
'civweb4'
:
'civweb4'
;
if
(
config
&&
config
.
home
)
{
setDefaultMountApp
(
`/civbase/
${
config
.
home
.
path
.
replace
(
/^
\/
/
,
''
)}
`
);
// const basePath =config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?'civweb4' :'civweb4';
// if(config && config.home) {
// setDefaultMountApp(`/civbase/${config.home.path.replace(/^\//, '')}`);
// } else {
// const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
// setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/${basePath}${homepage}`);
// createStoreage.set('init_web4', true)
// }
if
(
config
.
productType
&&
config
.
productType
!==
'civweb4'
)
{
setDefaultMountApp
(
`/civbase/
${
config
.
productType
}
/
${
config
.
homepage
.
replace
(
/^
\/
/
,
''
)}
`
);
}
else
{
const
homepage
=
_
.
isNull
(
config
.
homepage
)
?
'/index'
:
'/'
+
config
.
homepage
;
setDefaultMountApp
(
`/
${
pkg
.
name
.
toLocaleLowerCase
()}
/
${
basePath
}${
homepage
}
`
);
const
homepage
=
_
.
isNull
(
config
.
productType
)
?
'/index'
:
'/'
+
config
.
homepage
;
setDefaultMountApp
(
`/
${
pkg
.
name
.
toLocaleLowerCase
()}
/civweb4
${
homepage
}
`
);
createStoreage
.
set
(
'init_web4'
,
true
)
}
...
...
This diff is collapsed.
Click to expand it.
src/pages/user/login/login.js
View file @
99535258
...
...
@@ -222,7 +222,8 @@ class Login {
theme
:
self
.
globalConfig
.
theme
,
menu
:
self
.
globalConfig
.
menu
,
style
:
self
.
globalConfig
.
style
,
homepage
:
params
.
getParams
(
'redirect'
)
||
self
.
globalConfig
.
homepage
||
config
.
homepage
homepage
:
params
.
getParams
(
'redirect'
)
||
self
.
globalConfig
.
homepage
||
config
.
homepage
,
productType
:
config
.
productType
||
self
.
globalConfig
.
productType
||
'civweb4'
});
if
(
self
.
globalConfig
.
hasOwnProperty
(
'webConfig'
))
{
...
...
@@ -234,7 +235,8 @@ class Login {
}
self
.
updateConfig
&&
self
.
updateConfig
(
self
.
globalConfig
);
createStoreage
.
set
(
'globalConfig'
,
self
.
globalConfig
);
window
.
globalConfig
.
productType
=
self
.
globalConfig
.
productType
;
self
.
getProjectItems
().
then
(()
=>
{
window
.
subSysCfg
=
{};
result
.
forEach
(
item
=>
{
...
...
@@ -285,6 +287,8 @@ class Login {
if
(
mainConf
.
menu
)
self
.
globalConfig
.
menu
=
mainConf
.
menu
;
if
(
mainConf
.
shortcutIcon
)
self
.
globalConfig
.
shortcutIcon
=
mainConf
.
shortcutIcon
;
if
(
mainConf
.
productType
)
self
.
globalConfig
.
productType
=
mainConf
.
productType
;
}
self
.
updateConfig
&&
self
.
updateConfig
(
self
.
globalConfig
);
// console.log("===loginSuccess===")
...
...
@@ -297,6 +301,8 @@ class Login {
}
else
{
// loginSuccess
self
.
updateConfig
&&
self
.
updateConfig
(
self
.
globalConfig
);
createStoreage
.
set
(
'globalConfig'
,
self
.
globalConfig
);
window
.
globalConfig
.
productType
=
self
.
globalConfig
.
productType
;
// console.log("===loginSuccess===")
getIndustry
?
self
.
events
.
emit
(
'toggleIndustry'
)
...
...
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