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
501b1b24
Commit
501b1b24
authored
4 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: micro load defaultMountApp bug
parent
41b6ba90
Pipeline
#26841
skipped with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
proxy.js
config/proxy.js
+1
-1
micro.js
src/micro.js
+2
-1
No files found.
config/proxy.js
View file @
501b1b24
/* eslint-disable */
/* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
const
proxyURL
=
'http
://192.168.10.150:8777
'
;
const
proxyURL
=
'http
s://panda-water.com
'
;
module
.
exports
=
{
module
.
exports
=
{
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
dev
:
{
dev
:
{
...
...
This diff is collapsed.
Click to expand it.
src/micro.js
View file @
501b1b24
...
@@ -165,6 +165,7 @@ export const defaultApp = () => {
...
@@ -165,6 +165,7 @@ export const defaultApp = () => {
// eslint-disable-next-line no-undef
// eslint-disable-next-line no-undef
const
config
=
createStoreage
.
get
(
'globalConfig'
);
const
config
=
createStoreage
.
get
(
'globalConfig'
);
if
(
config
&&
config
.
token
)
{
if
(
config
&&
config
.
token
)
{
debugger
// const startWith = config.homepage ? config.homepage.split('/') : [];
// const startWith = config.homepage ? config.homepage.split('/') : [];
// console.log(findPathByLeafId(config.homepage, '', 'url'))
// console.log(findPathByLeafId(config.homepage, '', 'url'))
const
basePath
=
const
basePath
=
...
@@ -174,7 +175,7 @@ export const defaultApp = () => {
...
@@ -174,7 +175,7 @@ export const defaultApp = () => {
const
defaultURL
=
const
defaultURL
=
config
.
homepage
===
''
config
.
homepage
===
''
?
`/
${
pkg
.
name
.
toLocaleLowerCase
()}
/
${
basePath
}
?client=
${
config
.
client
}
`
?
`/
${
pkg
.
name
.
toLocaleLowerCase
()}
/
${
basePath
}
?client=
${
config
.
client
}
`
:
`
${
basePath
}
/
${
config
.
homepage
}
`
;
:
`
/
${
pkg
.
name
.
toLocaleLowerCase
()}
/
${
basePath
}
/
${
config
.
homepage
}
`
;
setDefaultMountApp
(
defaultURL
);
setDefaultMountApp
(
defaultURL
);
}
}
};
};
...
...
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