Merge branch 'JKDevelop' of http://106.75.45.236:3000/tongChong/forgeplus-react into JKDevelop

.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="https://osredm.com/account/lost_password" className="mr3 color-grey-9">找回密码</a>
-                      <em className="vertical-line"></em>
-                      <a href={settings && settings.new_course && settings.new_course.register_url} className="color-grey-9">注册</a>
+                      <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(`${main_web_site_url}/user_join`)} className="color-grey-9">注册</a>
                     </span>
                   </p>
                   {

src/modules/tpm/NewHeader.js

@@ -15,6 +15,7 @@ import 'antd/lib/input/style/index.css';
 import './TPMIndex.css';
 import './css/headerExcess.css';
 import logo from './images/hskylogo.png';
+import AddProjectModal from '../../forge/Head/AddProjectModal';
 import NoticeContent from 'src/forge/Head/NoticeContent';
 
 const $ = window.$
@@ -758,6 +759,9 @@ class NewHeader extends Component {
                           )
                         })
                       }
+                      <li>
+                        <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
+                      </li>
                     </ul>
                   }
                 </div>

src/modules/tpm/NewHeader_backup.js

@@ -1000,7 +1000,7 @@ class NewHeader extends Component {
                   height="34"
                   id="nh_user_logo"
                   name="avatar_image"
-                  src={getImageUrl(`images/` + user.image_url)}
+                  src={getImageUrl(`/` + user.image_url)}
                   width="34"
                 ></img>
               </a>