Merge pull request '修改登录弹框路径' (#340) from tongChong/forgeplus-react:feature_jk_homepage into pre_dev_military

package-lock.json

@@ -19235,15 +19235,13 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true,
+          "dev": true
-          "optional": true
         },
         "is-glob": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
           "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "is-extglob": "^2.1.1"
           }

package.json

@@ -119,7 +119,7 @@
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": " NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
     "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",

src/AppConfig.js

@@ -56,7 +56,7 @@ export function initAxiosInterceptors(props) {
   // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
   var
     proxy = "http://localhost:3000";
-    proxy = "https://forge.osredm.com";
+    proxy = "https://osredm.com";
     // proxy = "http://117.50.100.12:49999";
 
   const requestMap = {};

src/military/task/fetch.js

@@ -2,7 +2,7 @@
 import javaFetch from '../javaFetch';
 
 
-let settings = JSON.parse(localStorage.chromesetting);
+let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting);
 let actionUrl = settings && settings.api_urls ? settings.api_urls.task : 'https://task.osredm.com';
 
 const service = javaFetch(actionUrl);

src/military/task/static.js

@@ -137,9 +137,9 @@ export const formItemLayout = {
   },
 };
 
-export const main_web_site_url = JSON.parse(localStorage.chromesetting).main_web_site_url;
+export const main_web_site_url =localStorage.chromesetting && JSON.parse(localStorage.chromesetting).main_web_site_url;
 
-export const current_main_site_url = JSON.parse(localStorage.chromesetting).current_main_site_url;
+export const current_main_site_url =localStorage.chromesetting && JSON.parse(localStorage.chromesetting).current_main_site_url;
 
 
 export const formModalLayout = {

src/modules/login/LoginDialog.js

@@ -482,6 +482,8 @@ class LoginDialog extends Component {
       isRender = false
     }
 
+    const main_web_site_url =localStorage.chromesetting && JSON.parse(localStorage.chromesetting).main_web_site_url;
+
     return (
       <Dialog open={true} id="DialogID"
         className="zindextest"
@@ -580,9 +582,9 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a onClick={(url) => this.getloginurl("https://osredm.com/account/lost_password")}
+                      <a onClick={(url) => this.getloginurl(`${main_web_site_url}/account/lost_password`)}
                         className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                      <a onClick={(url) => this.getloginurl("https://osredm.com/user_join")} className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl(`${main_web_site_url}/user_join`)} className="color-grey-9">注册</a>
                     </span>
                   </p>