合并后续正式环境的修改，解决冲突

.gitignore

@@ -6,6 +6,8 @@ yarn-debug.log*
 yarn-error.log*
 yarn.lock
 
+package-lock.json*
+
 # Runtime data
 pids
 *.pid
@@ -87,5 +89,3 @@ typings/
 .DS_Store
 .idea/*
 
-package.json
-package-lock.json

src/modules/login/LoginDialog.js

@@ -463,6 +463,9 @@ class LoginDialog extends Component {
     if (isRender === undefined) {
       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"
@@ -562,9 +565,9 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a href="/resetPassword" className="mr3 color-grey-9">找回密码</a>
+                      <a onClick={(url) => this.getloginurl(`${main_web_site_url}/account/lost_password`)}
-                      <em className="vertical-line"></em>
+                        className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                      <a href="/register" className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl(`${main_web_site_url}/user_join`)} className="color-grey-9">注册</a>
                     </span>
                   </p>
                   {