Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web
This commit is contained in:
		
						commit
						f915fd5008
					
				@ -80,7 +80,7 @@
 | 
				
			|||||||
  "main": ".roadhogrc.mock.js",
 | 
					  "main": ".roadhogrc.mock.js",
 | 
				
			||||||
  "repository": {
 | 
					  "repository": {
 | 
				
			||||||
    "type": "git",
 | 
					    "type": "git",
 | 
				
			||||||
    "url": "http://47.122.43.22:3000/wyw/mh_jy_safe_web.git"
 | 
					    "url": "http://121.41.2.71:3000/wyw/mh_jy_safe_web.git"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "author": "",
 | 
					  "author": "",
 | 
				
			||||||
  "license": "ISC"
 | 
					  "license": "ISC"
 | 
				
			||||||
 | 
				
			|||||||
@ -28,9 +28,9 @@ const config = {
 | 
				
			|||||||
    picServerHost: 'http://localhost:5199',
 | 
					    picServerHost: 'http://localhost:5199',
 | 
				
			||||||
    dataVUrl: "http://localhost:8062/home",
 | 
					    dataVUrl: "http://localhost:8062/home",
 | 
				
			||||||
    version: version,
 | 
					    version: version,
 | 
				
			||||||
    guideSeverHost: "http://47.122.43.22/apk/",
 | 
					    guideSeverHost: "http://121.41.2.71/apk/",
 | 
				
			||||||
    guideH5Host: "http://47.122.43.22:9100/",
 | 
					    guideH5Host: "http://121.41.2.71:9100/",
 | 
				
			||||||
    h5Web: "http://47.122.43.22:9201/",
 | 
					    h5Web: "http://121.41.2.71:9201/",
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  cloud: {
 | 
					  cloud: {
 | 
				
			||||||
    serviceHost: api => {
 | 
					    serviceHost: api => {
 | 
				
			||||||
@ -51,18 +51,18 @@ const config = {
 | 
				
			|||||||
  test: {
 | 
					  test: {
 | 
				
			||||||
    serviceHost: api => {
 | 
					    serviceHost: api => {
 | 
				
			||||||
      const apis = getServiceHost(api)
 | 
					      const apis = getServiceHost(api)
 | 
				
			||||||
      return `http://47.122.43.22:${apis}`
 | 
					      return `http://121.41.2.71:${apis}`
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    flowServiceHost: "http://47.122.43.22:3188",
 | 
					    flowServiceHost: "http://121.41.2.71:3188",
 | 
				
			||||||
    cookieDomain: "",
 | 
					    cookieDomain: "",
 | 
				
			||||||
    hmiUrl: "http://47.122.43.22:8098/",
 | 
					    hmiUrl: "http://121.41.2.71:8098/",
 | 
				
			||||||
    webSocketHost: 'ws://47.122.43.22:3140/',
 | 
					    webSocketHost: 'ws://121.41.2.71:3140/',
 | 
				
			||||||
    picServerHost: 'http://47.122.43.22:5199',
 | 
					    picServerHost: 'http://121.41.2.71:5199',
 | 
				
			||||||
    dataVUrl: "http://47.122.43.22:3167/home",
 | 
					    dataVUrl: "http://121.41.2.71:3167/home",
 | 
				
			||||||
    version: version,
 | 
					    version: version,
 | 
				
			||||||
    guideSeverHost: "http://47.122.43.22/apk/",
 | 
					    guideSeverHost: "http://121.41.2.71/apk/",
 | 
				
			||||||
    guideH5Host: "http://47.122.43.22:9100/",
 | 
					    guideH5Host: "http://121.41.2.71:9100/",
 | 
				
			||||||
    h5Web: "http://47.122.43.22:9201/",
 | 
					    h5Web: "http://121.41.2.71:9201/",
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -89,11 +89,11 @@ switch (window.location.host) {
 | 
				
			|||||||
  case "xmmhe.com:5005":
 | 
					  case "xmmhe.com:5005":
 | 
				
			||||||
    env = "cloud"
 | 
					    env = "cloud"
 | 
				
			||||||
    break
 | 
					    break
 | 
				
			||||||
  case "47.122.43.22:5000":
 | 
					  case "121.41.2.71:5000":
 | 
				
			||||||
  case "47.122.43.22:5001":
 | 
					  case "121.41.2.71:5001":
 | 
				
			||||||
  case "47.122.43.22:5002":
 | 
					  case "121.41.2.71:5002":
 | 
				
			||||||
  case "47.122.43.22:5003":
 | 
					  case "121.41.2.71:5003":
 | 
				
			||||||
  case "47.122.43.22:5004":
 | 
					  case "121.41.2.71:5004":
 | 
				
			||||||
    env = "test"
 | 
					    env = "test"
 | 
				
			||||||
    break
 | 
					    break
 | 
				
			||||||
  default:
 | 
					  default:
 | 
				
			||||||
 | 
				
			|||||||
@ -555,7 +555,7 @@ function Header(props) {
 | 
				
			|||||||
        <div className="header__right">
 | 
					        <div className="header__right">
 | 
				
			||||||
          {/* <RiskFourColor/> */}
 | 
					          {/* <RiskFourColor/> */}
 | 
				
			||||||
          {/* <FullScreen /> */}
 | 
					          {/* <FullScreen /> */}
 | 
				
			||||||
          {window.location.host == "47.122.43.22:8001" ? <FullScreen /> : ""} 
 | 
					          {window.location.host == "121.41.2.71:8001" ? <FullScreen /> : ""} 
 | 
				
			||||||
          <GuideCode />
 | 
					          <GuideCode />
 | 
				
			||||||
          <HeaderNav />
 | 
					          <HeaderNav />
 | 
				
			||||||
          <HeaderDataV />
 | 
					          <HeaderDataV />
 | 
				
			||||||
 | 
				
			|||||||
@ -21,7 +21,7 @@ export default {
 | 
				
			|||||||
          if (window.navigator.userAgent.indexOf("Windows") < 1)
 | 
					          if (window.navigator.userAgent.indexOf("Windows") < 1)
 | 
				
			||||||
          {
 | 
					          {
 | 
				
			||||||
            window.location.replace(config.guideH5Host)
 | 
					            window.location.replace(config.guideH5Host)
 | 
				
			||||||
            // window.location.href="http://47.122.43.22:9100"
 | 
					            // window.location.href="http://121.41.2.71:9100"
 | 
				
			||||||
            // dispatch(routerRedux.push('/HomeMobileNew'))
 | 
					            // dispatch(routerRedux.push('/HomeMobileNew'))
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
          else
 | 
					          else
 | 
				
			||||||
 | 
				
			|||||||
@ -37,7 +37,7 @@ const formItemLayout = {
 | 
				
			|||||||
  labelCol: { span: 6 },
 | 
					  labelCol: { span: 6 },
 | 
				
			||||||
  wrapperCol: { span: 14 },
 | 
					  wrapperCol: { span: 14 },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
// window.location.href="http://47.122.43.22:9100"
 | 
					// window.location.href="http://121.41.2.71:9100"
 | 
				
			||||||
const openNotification = placement => {
 | 
					const openNotification = placement => {
 | 
				
			||||||
  notification.info({
 | 
					  notification.info({
 | 
				
			||||||
    duration: null,
 | 
					    duration: null,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user