diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js
index bec5835f5..a9322a74d 100644
--- a/public/react/src/modules/question/component/Listjihe.js
+++ b/public/react/src/modules/question/component/Listjihe.js
@@ -17,7 +17,10 @@ const tagArrays = [
 	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R',
 	'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 ]
+<<<<<<< HEAD
 
+=======
+>>>>>>> d0ddf91... 题库
 class Listjihe extends Component {
 	constructor(props) {
 		super(props);
@@ -97,6 +100,7 @@ class Listjihe extends Component {
 												MULTIPLEkey = MULTIPLEkey + tagArrays[i];
 											}
 
+<<<<<<< HEAD
 										}
 									}
 								}
@@ -111,10 +115,44 @@ class Listjihe extends Component {
 											rightkey = i;
 											break;
 										}
+=======
+		// 编程答案
+		var rightkey=null
+
+		if(items){
+			if(items.item_type){
+				if(items.item_type==="PROGRAM"){
+
+				}else{
+					if(items.item_type==="JUDGMENT") {
+
+
+						if(items.choices){
+							if(items.choices.length>0){
+								var arr= items.choices;
+								for(let data of arr) {
+									if(data.is_answer===true){
+										rightkey=data.choice_text;
+										break;
+>>>>>>> d0ddf91... 题库
 									}
 								}
 							}
 						}
+					}else {
+						if (items.choices) {
+							if (items.choices.length > 0) {
+								var arr = items.choices;
+								for (var i = 0; i < arr.length; i++) {
+									if (arr[i].is_answer === true) {
+										rightkey = i;
+										break;
+									}
+								}
+							}
+						}
+
+
 					}
 				}
 			}
@@ -196,6 +234,7 @@ class Listjihe extends Component {
 				</div>
 				{/*内容*/}
 				<div className="w100s sortinxdirection ">
+<<<<<<< HEAD
 					{items.item_type === "JUDGMENT" ?
 						<p className="w100s listjihetixingstitsp sortinxdirection ">
 							{
@@ -211,6 +250,23 @@ class Listjihe extends Component {
 							}
 						</p> :
 						items.item_type === "PROGRAM" ?
+=======
+					{items.item_type==="JUDGMENT"?
+         <p className="w100s listjihetixingstits sortinxdirection ">
+					 {
+						 items === undefined ||items === null? "" : items.choices.map((object, index) => {
+							 return (
+								 <p className={index===1? "sortinxdirection  ml10":"sortinxdirection  " }  >
+									 <Radio disabled={false}>
+										 {object.choice_text}
+									 </Radio>
+								 </p>
+							 )
+						 })
+					 }
+				</p>:
+						items.item_type==="PROGRAM"?
+>>>>>>> d0ddf91... 题库
 							<p className="w100s listjihetixingstitssy sortinxdirection ">
 								<p className={"sortinxdirection  mt15"}>
 									{
@@ -401,6 +457,7 @@ class Listjihe extends Component {
 						<div className="w100s questiontypeheng mt23">
 
 						</div>
+<<<<<<< HEAD
 						<div className=" sortinxdirection mt15 yldxtit">
 
 							{
@@ -423,6 +480,21 @@ class Listjihe extends Component {
 											dangerouslySetInnerHTML={{ __html: markdownToHTML("答案：" + rightkey).replace(/▁/g, "▁▁▁") }}
 										>
 										</p>
+=======
+						<div className=" sortinxdirection mt15 yldxtit" >
+
+							{
+								items.item_type==="SINGLE" || items.item_type==="MULTIPLE"?
+									<p className=" testfondex yldxtit"
+										 style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+tagArrays[rightkey]).replace(/▁/g, "▁▁▁")}}
+									>
+									</p>
+									:
+									<p className=" testfondex yldxtit"
+										 style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML("答案："+rightkey).replace(/▁/g, "▁▁▁")}}
+									>
+									</p>
+>>>>>>> d0ddf91... 题库
 							}
 
 						</div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 60df25c5d..d0e16331e 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -992,15 +992,9 @@ class NewHeader extends Component {
 
 
 
-<<<<<<< HEAD
-    <style>
-      {
-        `
-=======
-				<style>
-					{
-						`
->>>>>>> e49ad4f... 调整
+        <style>
+          {
+            `
           .posi - searchs{
         opacity: 1;
             position: absolute;
@@ -1012,251 +1006,251 @@ class NewHeader extends Component {
 								`
           }
         </style>
-      <div className="posi-searchs"  >
-        <div className="search-all clearfix">
-          {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
-          <div className="fl pr search-clear edu-menu-panel" style={{ display: 'none' }}>
-            <input type="hidden" id="search_type" value="1"></input>
-            <span className="searchkey">实训</span>
-            <i className="fa fa-angle-down ml5 font-16"></i>
-            <ul id="searchkey" className="edu-menu-list edu-txt-center" style={{ minWidth: '80px', right: '-10px', top: '50px' }}>
-              <li><a>实训</a></li>
-              <li><a>课堂</a></li>
-              <li><a>用户</a></li>
-            </ul>
-          </div>
-          {/*<input type="text" className="search-input fl" id="search-input" */}
-          {/*onKeyDown={this.onKeywordSearchKeyDown} name="search_keyword" placeholder="搜索实训项目"/>*/}
-          {/*搜索框*/}
-          {showSearchOpentype === true ? <div
-            className={"HeaderSearch"}
-            onBlur={(e) => this.hideshowSearchOpen(e)} onMouseLeave={() => this.setevaluatinghides()}>
-            <Search
-              id={"HeaderSearchs"}
-              placeholder="实践课程/教学课堂/实训项目/交流问答"
-              onInput={() => this.onKeywordSearchKeyDowns()}
-              onSearch={(value) => this.onKeywordSearchKeyDown(value)}
-              // onPressEnter={this.onKeywordSearchKeyDown}
-              style={{ width: 300, height: 32 }}
-              autoFocus={true}
-            />
-          </div> : ""}
-
-          {/*<a className="search-icon fl" id="header_keyword_search" onClick={this.onKeywordSearch}>*/}
-          {/*/!*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*!/*/}
-          {/*<i className="iconfont icon-sousuo color-blue"></i>*/}
-
-          {/*</a>*/}
-          {/* TODO 需要服务端接口提供最近搜索
+        <div className="posi-searchs"  >
+          <div className="search-all clearfix">
+            {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
+            <div className="fl pr search-clear edu-menu-panel" style={{ display: 'none' }}>
+              <input type="hidden" id="search_type" value="1"></input>
+              <span className="searchkey">实训</span>
+              <i className="fa fa-angle-down ml5 font-16"></i>
+              <ul id="searchkey" className="edu-menu-list edu-txt-center" style={{ minWidth: '80px', right: '-10px', top: '50px' }}>
+                <li><a>实训</a></li>
+                <li><a>课堂</a></li>
+                <li><a>用户</a></li>
+              </ul>
+            </div>
+            {/*<input type="text" className="search-input fl" id="search-input" */}
+            {/*onKeyDown={this.onKeywordSearchKeyDown} name="search_keyword" placeholder="搜索实训项目"/>*/}
+            {/*搜索框*/}
+            {showSearchOpentype === true ? <div
+              className={"HeaderSearch"}
+              onBlur={(e) => this.hideshowSearchOpen(e)} onMouseLeave={() => this.setevaluatinghides()}>
+              <Search
+                id={"HeaderSearchs"}
+                placeholder="实践课程/教学课堂/实训项目/交流问答"
+                onInput={() => this.onKeywordSearchKeyDowns()}
+                onSearch={(value) => this.onKeywordSearchKeyDown(value)}
+                // onPressEnter={this.onKeywordSearchKeyDown}
+                style={{ width: 300, height: 32 }}
+                autoFocus={true}
+              />
+            </div> : ""}
+
+            {/*<a className="search-icon fl" id="header_keyword_search" onClick={this.onKeywordSearch}>*/}
+            {/*/!*<i className="fa fa-search font-16 mt23 color-grey-6"></i>*!/*/}
+            {/*<i className="iconfont icon-sousuo color-blue"></i>*/}
+
+            {/*</a>*/}
+            {/* TODO 需要服务端接口提供最近搜索
                             <div className="search-content none" style="width: 86%;left:  0px;">
                               <div className="search-title">最近搜索</div>
                                   <div><a href="javascript:void(0)" className="search_history">绿盟</a></div>
                                   <div><a href="javascript:void(0)" className="search_history">qwe</a></div>
                             </div>*/}
+          </div>
         </div>
-      </div>
 
         {/*<span className="font-15 fr mt17">
 			      	<%= link_to '登录', signin_path, :className => "mr5" %>
 			      	<em className="vertical-line"></em>
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
-    {
-      user === undefined ?
-      <span className="font-15 fr mt17 ml5 mr25">
-        <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
-        <em className="vertical-line"></em>
-        <a href={"/register"} className="mr5 color-white">注册</a>
-      </span> : user.login === "" ? <span className="font-15 fr mt17 ml5 mr25">
-        <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
-        <em className="vertical-line"></em>
-        <a href={"/register"} className="mr5 color-white">注册</a>
-      </span> :
-        <div className="fr edu-menu-panel mr25" style={{ height: '60px' }}>
-          <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`} className="fl ml15">
-            <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
-              src={getImageUrl(`images/` + user.image_url)} width="34">
-            </img>
-          </a>
-          <ul className="edu-menu-list" style={{ top: '60px' }}>
-            {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
-            <li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
-            {coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
-            {/* p 老师  l 学生 */}
-            {shixuntype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
-            {pathstype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/paths`}>{this.props.user && this.props.user.main_site === false ? "我的课程" : "我的实践课程"}</Link></li>}
-            {this.props.user && this.props.user.main_site === true ? <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/projects`}>我的开发项目</Link></li> : ""}
-            {/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
-            <li style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url === null || this.props.Headertop.customer_management_url === "" ? 'none' : 'block' }}>
-              <a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>
-            </li>
-            {
-              this.props.Headertop && this.props.Headertop.college_identifier &&
-              <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
-            }
-            {
-              this.props.Headertop && this.props.Headertop.laboratory_user &&
-              <li><a href={this.props.Headertop.laboratory_admin_url}>后台管理</a></li>
-            }
+        {
+          user === undefined ?
+            <span className="font-15 fr mt17 ml5 mr25">
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
+              <em className="vertical-line"></em>
+              <a href={"/register"} className="mr5 color-white">注册</a>
+            </span> : user.login === "" ? <span className="font-15 fr mt17 ml5 mr25">
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
+              <em className="vertical-line"></em>
+              <a href={"/register"} className="mr5 color-white">注册</a>
+            </span> :
+              <div className="fr edu-menu-panel mr25" style={{ height: '60px' }}>
+                <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`} className="fl ml15">
+                  <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
+                    src={getImageUrl(`images/` + user.image_url)} width="34">
+                  </img>
+                </a>
+                <ul className="edu-menu-list" style={{ top: '60px' }}>
+                  {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
+                  <li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
+                  {coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
+                  {/* p 老师  l 学生 */}
+                  {shixuntype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
+                  {pathstype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/paths`}>{this.props.user && this.props.user.main_site === false ? "我的课程" : "我的实践课程"}</Link></li>}
+                  {this.props.user && this.props.user.main_site === true ? <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/projects`}>我的开发项目</Link></li> : ""}
+                  {/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
+                  <li style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url === null || this.props.Headertop.customer_management_url === "" ? 'none' : 'block' }}>
+                    <a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>
+                  </li>
+                  {
+                    this.props.Headertop && this.props.Headertop.college_identifier &&
+                    <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
+                  }
+                  {
+                    this.props.Headertop && this.props.Headertop.laboratory_user &&
+                    <li><a href={this.props.Headertop.laboratory_admin_url}>后台管理</a></li>
+                  }
 
-            <li><a href={`/account/profile`}>账号管理</a></li>
-            {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
-            {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
-            {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
+                  <li><a href={`/account/profile`}>账号管理</a></li>
+                  {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
+                  {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
+                  {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
 
-            <li className="bor-top-greyE">
+                  <li className="bor-top-greyE">
 
-              {/*<a onClick={()=>this.educoderlogin()} >登录</a>*/}
-              <a onClick={() => this.educoderloginysl()}>退出</a>
+                    {/*<a onClick={()=>this.educoderlogin()} >登录</a>*/}
+                    <a onClick={() => this.educoderloginysl()}>退出</a>
 
-            </li>
-          </ul>
-        </div>
-    }
-    {/*href="https://www.educoder.net/login"*/ }
-    <div className="fr head-right">
-      {/*{ loadHeader()}*/}
-      {showSearchOpentype === true ? "" : this.props.user && this.props.user.main_site === true ? <a id="search-open" className="fl mr30 headIcon" onClick={(e) => this.showSearchOpen(e)}>
-        {/*"/images/educoder/icon/search.svg"
+                  </li>
+                </ul>
+              </div>
+        }
+        {/*href="https://www.educoder.net/login"*/}
+        <div className="fr head-right">
+          {/*{ loadHeader()}*/}
+          {showSearchOpentype === true ? "" : this.props.user && this.props.user.main_site === true ? <a id="search-open" className="fl mr30 headIcon" onClick={(e) => this.showSearchOpen(e)}>
+            {/*"/images/educoder/icon/search.svg"
                              <img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */}
 
-        <i className="iconfont icon-sousuo color-white"></i>
-      </a> : ""}
+            <i className="iconfont icon-sousuo color-white"></i>
+          </a> : ""}
+
+          {/*</div>*/}
+          <div className="fl mr30 edu-menu-panel headIcon">
+
+
+            <i className="iconfont icon-tianjiafangda color-white"></i>
+
+            <div className="edu-menu-list" style={{ top: '60px', width: "240px" }}>
+              <div className="overPart"></div>
+              <ul className={coursestypes === true && this.props.user && this.props.user.main_site === false ? "fl headwith100b edu-txt-center pr ul-leftline" : "fl with50 edu-txt-center pr ul-leftline"}>
+                {this.props.current_user && this.props.current_user.user_identity === "学生" ? "" : coursestypes === false ?
+                  <li><a onClick={(url) => this.getUser("/courses/new")}>{this.props.user && this.props.user.main_site === false ? "新建课堂" : "新建教学课堂"}</a></li> : ""
+                }
+                {shixuntype === true ? "" :
+                  <li><a onClick={(url) => this.getUser("/shixuns/new", "newshixuns")}>新建实训项目</a></li>
+                }
+                {this.props.user && this.props.user.main_site === false ? "" : this.props.Headertop === undefined ? "" : <li><a onClick={(url) => this.getUser("/paths/new")} >新建实践课程</a></li>}
+                {this.props.user && this.props.user.main_site === true ? "" : this.props.Headertop === undefined ? "" :
+                  pathstype === true ? "" : this.props.user && this.props.user.admin === true || this.props.user && this.props.user.is_teacher === true || this.props.user && this.props.user.business === true ? <li><a onClick={(url) => this.getUser("/paths/new")} >新建实践课程</a></li> : ""
+                }
+                {this.props.user && this.props.user.main_site === true ? <li><a onClick={(url) => this.getUser("/projects/new", "projects")} target="_blank">新建开发项目</a></li> : ""}
+              </ul>
+              {coursestypes === true && this.props.user && this.props.user.main_site === false ? "" : <ul className="fl with50 edu-txt-center">
+
+                {coursestypes === true ? "" : <li>
+                  <a onClick={this.tojoinclass}>{this.props.user && this.props.user.main_site === false ? "加入课堂" : "加入教学课堂"}</a>
+                </li>}
+
+                {Addcoursestypes === true ? <Addcourses
+                  Addcoursestype={Addcoursestypes}
+                  hideAddcoursestype={this.hideAddcoursestypes}
+                  HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)}
+                /> : ""}
+                <Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} />
+
+
+                {/*  /courses/join_course_multi_role */}
+                {this.props.user && this.props.user.main_site === true ? <li>
+                  <a onClick={this.tojoinitem}>加入开发项目</a>
+                </li> : ""}
+                {tojoinitemtype === true ? <Modal
+                  keyboard={false}
+                  title="加入项目"
+                  visible={tojoinitemtype}
+                  closable={false}
+                  footer={null}
+                >
+                  <div className="task_popup_con">
+                    <div className="mr15">
+                      <ul>
+                        <li className="clearfix mb10">
+                          <label className="panel-form-label fl">项目邀请码：</label>
+                          <Input type="text" className="input-60-40 fl mt5" name="invite_code"
+                            style={{ width: '275px' }}
+                            placeholder="请输入6位开发项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue} />
+                        </li>
 
-      {/*</div>*/}
-      <div className="fl mr30 edu-menu-panel headIcon">
+                        <p id="none_invite_code_notice"
+                          className="color-orange none f12"
+                          style={{ marginLeft: '90px', display: code_notice === true ? 'block' : "none" }}>请输入6位项目邀请码</p>
 
+                        <li className="clearfix ">
 
-        <i className="iconfont icon-tianjiafangda color-white"></i>
+                          <label className="panel-form-label fl">身份：</label>
+                          <RadioGroup className="mt10" onChange={this.onChangeRadioGroup}>
+                            <Radio value={"manager"}>管理人员</Radio>
+                            <Radio value={"developer"}>开发人员</Radio>
+                            <Radio value={"reporter"}>报告人员</Radio>
+                          </RadioGroup>
 
-        <div className="edu-menu-list" style={{ top: '60px', width: "240px" }}>
-          <div className="overPart"></div>
-          <ul className={coursestypes === true && this.props.user && this.props.user.main_site === false ? "fl headwith100b edu-txt-center pr ul-leftline" : "fl with50 edu-txt-center pr ul-leftline"}>
-            {this.props.current_user && this.props.current_user.user_identity === "学生" ? "" : coursestypes === false ?
-              <li><a onClick={(url) => this.getUser("/courses/new")}>{this.props.user && this.props.user.main_site === false ? "新建课堂" : "新建教学课堂"}</a></li> : ""
-            }
-            {shixuntype === true ? "" :
-              <li><a onClick={(url) => this.getUser("/shixuns/new", "newshixuns")}>新建实训项目</a></li>
-            }
-            {this.props.user && this.props.user.main_site === false ? "" : this.props.Headertop === undefined ? "" : <li><a onClick={(url) => this.getUser("/paths/new")} >新建实践课程</a></li>}
-            {this.props.user && this.props.user.main_site === true ? "" : this.props.Headertop === undefined ? "" :
-              pathstype === true ? "" : this.props.user && this.props.user.admin === true || this.props.user && this.props.user.is_teacher === true || this.props.user && this.props.user.business === true ? <li><a onClick={(url) => this.getUser("/paths/new")} >新建实践课程</a></li> : ""
-            }
-            {this.props.user && this.props.user.main_site === true ? <li><a onClick={(url) => this.getUser("/projects/new", "projects")} target="_blank">新建开发项目</a></li> : ""}
-          </ul>
-          {coursestypes === true && this.props.user && this.props.user.main_site === false ? "" : <ul className="fl with50 edu-txt-center">
-
-            {coursestypes === true ? "" : <li>
-              <a onClick={this.tojoinclass}>{this.props.user && this.props.user.main_site === false ? "加入课堂" : "加入教学课堂"}</a>
-            </li>}
-
-            {Addcoursestypes === true ? <Addcourses
-              Addcoursestype={Addcoursestypes}
-              hideAddcoursestype={this.hideAddcoursestypes}
-              HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)}
-            /> : ""}
-            <Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} />
-
-
-            {/*  /courses/join_course_multi_role */}
-            {this.props.user && this.props.user.main_site === true ? <li>
-              <a onClick={this.tojoinitem}>加入开发项目</a>
-            </li> : ""}
-            {tojoinitemtype === true ? <Modal
-              keyboard={false}
-              title="加入项目"
-              visible={tojoinitemtype}
-              closable={false}
-              footer={null}
+                        </li>
+
+                        <p id="none_checked_notice" className="color-orange none f12"
+                          style={{ marginLeft: '90px', display: checked_notice === true ? 'block' : "none" }}>请选择一个身份</p>
+
+                        <li className="clearfix mt10 edu-txt-center">
+                          <a className="task-btn mr10"
+                            onClick={() => this.hidetojoinclass(1)}>取消</a>
+                          <a
+                            className="task-btn task-btn-orange ml20"
+                            onClick={() => this.submittojoinclass(1)}>确定</a>
+                        </li>
+
+                      </ul>
+                    </div>
+                  </div>
+                </Modal> : ""}
+              </ul>}
+            </div>
+          </div>
+
+          {this.props.user && this.props.user.main_site === true ? <div className="fl mr30 edu-menu-panel headIcon">
+            {user === undefined ? "" : user.login === "" ? "" : <a
+              href={`/messages/${user.login}/user_tidings`}
+              style={{ position: 'relative' }}
             >
-              <div className="task_popup_con">
-                <div className="mr15">
-                  <ul>
-                    <li className="clearfix mb10">
-                      <label className="panel-form-label fl">项目邀请码：</label>
-                      <Input type="text" className="input-60-40 fl mt5" name="invite_code"
-                        style={{ width: '275px' }}
-                        placeholder="请输入6位开发项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue} />
-                    </li>
-
-                    <p id="none_invite_code_notice"
-                      className="color-orange none f12"
-                      style={{ marginLeft: '90px', display: code_notice === true ? 'block' : "none" }}>请输入6位项目邀请码</p>
-
-                    <li className="clearfix ">
-
-                      <label className="panel-form-label fl">身份：</label>
-                      <RadioGroup className="mt10" onChange={this.onChangeRadioGroup}>
-                        <Radio value={"manager"}>管理人员</Radio>
-                        <Radio value={"developer"}>开发人员</Radio>
-                        <Radio value={"reporter"}>报告人员</Radio>
-                      </RadioGroup>
-
-                    </li>
-
-                    <p id="none_checked_notice" className="color-orange none f12"
-                      style={{ marginLeft: '90px', display: checked_notice === true ? 'block' : "none" }}>请选择一个身份</p>
-
-                    <li className="clearfix mt10 edu-txt-center">
-                      <a className="task-btn mr10"
-                        onClick={() => this.hidetojoinclass(1)}>取消</a>
-                      <a
-                        className="task-btn task-btn-orange ml20"
-                        onClick={() => this.submittojoinclass(1)}>确定</a>
-                    </li>
-
-                  </ul>
-                </div>
-              </div>
-            </Modal> : ""}
-          </ul>}
-        </div>
-      </div>
+              <i className="iconfont icon-xiaoxilingdang color-white"></i>
+              <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
+                {/*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*/}
+                {/*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*/}
+              </span>
+            </a>
+            }
 
-      {this.props.user && this.props.user.main_site === true ? <div className="fl mr30 edu-menu-panel headIcon">
-        {user === undefined ? "" : user.login === "" ? "" : <a
-          href={`/messages/${user.login}/user_tidings`}
-          style={{ position: 'relative' }}
-        >
-          <i className="iconfont icon-xiaoxilingdang color-white"></i>
-          <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
-            {/*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*/}
-            {/*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*/}
-          </span>
-        </a>
-        }
+          </div> : ""}
 
-      </div> : ""}
-
-      <Modal
-        keyboard={false}
-        title="提示"
-        visible={submitapplications}
-        closable={false}
-        footer={null}
-      >
-        <div className="task_popup_con  ml30">
-          <div className="mr15">
-            <ul>
-              <div className="task-popup-content">
-                <p className="task-popup-text-center font-16">
-                  {submitapplicationsvalue}
-                </p>
+          <Modal
+            keyboard={false}
+            title="提示"
+            visible={submitapplications}
+            closable={false}
+            footer={null}
+          >
+            <div className="task_popup_con  ml30">
+              <div className="mr15">
+                <ul>
+                  <div className="task-popup-content">
+                    <p className="task-popup-text-center font-16">
+                      {submitapplicationsvalue}
+                    </p>
+                  </div>
+                  <li className="clearfix mt10 edu-txt-center">
+                    <a className="task-btn mr10"
+                      onClick={this.hidesubmitapplications}>取消</a>
+                    <a
+                      className="task-btn task-btn-orange ml20"
+                      onClick={this.submitsubmitapplications}>确定</a>
+                  </li>
+
+                </ul>
               </div>
-              <li className="clearfix mt10 edu-txt-center">
-                <a className="task-btn mr10"
-                  onClick={this.hidesubmitapplications}>取消</a>
-                <a
-                  className="task-btn task-btn-orange ml20"
-                  onClick={this.submitsubmitapplications}>确定</a>
-              </li>
-
-            </ul>
-          </div>
-        </div>
-      </Modal>
+            </div>
+          </Modal>
 
-    </div>
+        </div>
 
       </div >