Commit 064a6c3c authored by GuanHua's avatar GuanHua

fix:修改是否要使用pass配置的域名判断

parent 1af28cde
......@@ -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,
......
......@@ -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: '/',
......
......@@ -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,
......
......@@ -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=true yarn start"
"start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=false yarn start"
},
"lint-staged": {
"*.{js,jsx,less,md,json}": [
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment