Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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
陈智峰
jinfa-platform
Commits
064a6c3c
Commit
064a6c3c
authored
Oct 26, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改是否要使用pass配置的域名判断
parent
1af28cde
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
index.ts
config/channelRoutes/index.ts
+2
-2
index.ts
config/mallRoutes/index.ts
+1
-3
index.ts
config/selfchannelRoutes/index.ts
+2
-2
package.json
package.json
+1
-1
index.ts
src/global/config/index.ts
+2
-2
No files found.
config/channelRoutes/index.ts
View file @
064a6c3c
...
...
@@ -7,8 +7,8 @@ let webChannelPointInfo = shopInfo.filter(item => item.environment === 1 && item
const
defaultChannelRoute
=
'/channelmall'
// 默认渠道商城根路径
const
defaultIChannelPointRoute
=
'/pointsMall'
// 默认渠道积分商城路径
const
rootRoute
=
process
.
env
.
USE_ROUTE_CONFIG
?
checkUrl
(
webChannelInfo
.
url
,
defaultChannelRoute
)
:
defaultChannelRoute
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
?
checkUrl
(
webChannelPointInfo
.
url
,
defaultIChannelPointRoute
)
:
defaultIChannelPointRoute
const
rootRoute
=
process
.
env
.
USE_ROUTE_CONFIG
===
'true'
?
checkUrl
(
webChannelInfo
.
url
,
defaultChannelRoute
)
:
defaultChannelRoute
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
===
'true'
?
checkUrl
(
webChannelPointInfo
.
url
,
defaultIChannelPointRoute
)
:
defaultIChannelPointRoute
const
ChannelRoute
=
{
path
:
rootRoute
,
...
...
config/mallRoutes/index.ts
View file @
064a6c3c
...
...
@@ -9,9 +9,7 @@ const shopInfo = BASE_CONFIG.web.shopInfo
let
webPointMallInfo
=
shopInfo
.
filter
(
item
=>
item
.
environment
===
1
&&
item
.
type
===
2
)[
0
]
// 积分商城
const
defaultPointMallRoute
=
'/pointsMall'
// 积分商城默认路径
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
?
checkUrl
(
webPointMallInfo
.
url
,
defaultPointMallRoute
)
:
defaultPointMallRoute
console
.
log
(
process
.
env
.
USE_ROUTE_CONFIG
,
checkUrl
(
webPointMallInfo
.
url
,
defaultPointMallRoute
),
pointMallRoute
,
"pointMallRoute"
)
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
===
'true'
?
checkUrl
(
webPointMallInfo
.
url
,
defaultPointMallRoute
)
:
defaultPointMallRoute
const
mallRoute
=
{
path
:
'/'
,
...
...
config/selfchannelRoutes/index.ts
View file @
064a6c3c
...
...
@@ -7,8 +7,8 @@ let webChannelPointInfo = shopInfo.filter(item => item.environment === 1 && item
const
defaultIChannelRoute
=
'/ichannelmall'
// 默认渠道商城根路径
const
defaultIChannelPointRoute
=
'/pointsMall'
// 默认渠道积分商城路径
const
rootRoute
=
process
.
env
.
USE_ROUTE_CONFIG
?
checkUrl
(
webIChannelInfo
.
url
,
defaultIChannelRoute
)
:
defaultIChannelRoute
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
?
checkUrl
(
webChannelPointInfo
.
url
,
defaultIChannelPointRoute
)
:
defaultIChannelPointRoute
const
rootRoute
=
process
.
env
.
USE_ROUTE_CONFIG
===
'true'
?
checkUrl
(
webIChannelInfo
.
url
,
defaultIChannelRoute
)
:
defaultIChannelRoute
const
pointMallRoute
=
process
.
env
.
USE_ROUTE_CONFIG
===
'true'
?
checkUrl
(
webChannelPointInfo
.
url
,
defaultIChannelPointRoute
)
:
defaultIChannelPointRoute
const
selfChannelRoute
=
{
path
:
rootRoute
,
...
...
package.json
View file @
064a6c3c
...
...
@@ -20,7 +20,7 @@
"test:coverage"
:
"umi-test --coverage"
,
"start:cross"
:
"cross-env SITE_ID=352 USE_ROUTE_CONFIG=false yarn start"
,
"start:url"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=true yarn start"
,
"start:10"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=
tru
e yarn start"
"start:10"
:
"cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=
fals
e yarn start"
},
"lint-staged"
:
{
"*.{js,jsx,less,md,json}"
:
[
...
...
src/global/config/index.ts
View file @
064a6c3c
...
...
@@ -33,8 +33,8 @@ let webIChannelInfo = SELF_CONFIG.web.shopInfo.filter(item => item.environment =
const
defaultChannelRoute
=
'/channelmall'
// 默认渠道商城根路径
const
defaultIChannelRoute
=
'/ichannelmall'
// 默认渠道自有商城根路径
const
channelRootRoute
=
MALL_ROUTE_USE_CONFIG
?
checkUrl
(
webChannelInfo
.
url
,
defaultChannelRoute
)
:
defaultChannelRoute
const
ichannelRootRoute
=
MALL_ROUTE_USE_CONFIG
?
checkUrl
(
webIChannelInfo
.
url
,
defaultIChannelRoute
)
:
defaultIChannelRoute
const
channelRootRoute
=
MALL_ROUTE_USE_CONFIG
===
'true'
?
checkUrl
(
webChannelInfo
.
url
,
defaultChannelRoute
)
:
defaultChannelRoute
const
ichannelRootRoute
=
MALL_ROUTE_USE_CONFIG
===
'true'
?
checkUrl
(
webIChannelInfo
.
url
,
defaultIChannelRoute
)
:
defaultIChannelRoute
...
...
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