diff --git a/app/views/cooperative/laboratory_settings/edit.html.erb b/app/views/cooperative/laboratory_settings/edit.html.erb
index 4dc350610..a3e165627 100644
--- a/app/views/cooperative/laboratory_settings/edit.html.erb
+++ b/app/views/cooperative/laboratory_settings/edit.html.erb
@@ -145,7 +145,7 @@
           </thead>
           <tbody>
           <% (setting.navbar || setting.default_navbar).each do |nav| %>
-            <tr>
+            <tr style="<%= nav['name'] == '交流问答' ? 'display:none' : '' %>">
               <td><%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %></td>
               <td><%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %></td>
               <td class="text-center">
diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index 6fd4d7db7..e747a81e3 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -78,7 +78,6 @@ class CompetitionsIndex extends Component{
 												height: 300px;
 									      background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
 											  background-color: #081C4B;
-												background-size: cover;
 												background-position: center;
 												background-repeat: no-repeat;
 										}
diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
index 6aa2fd641..cddb1492b 100644
--- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
+++ b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
@@ -153,7 +153,6 @@
 
 .Competitionshead{
     background-color: #2d28ba !important;
-    background-size: cover !important;
     background-position: center !important;
     background-position: 50% !important;
     background-repeat: no-repeat !important;
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index c63348c83..d6e2bf650 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -827,7 +827,7 @@ class Fileslists extends Component{
 										{this.props.isAdmin()?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:""}
                     {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""}
 
-                    {this.props.isAdmin()||this.props.isStudent() ?  <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:""}
+                    {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:"":""}
                     {this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""}
                   </React.Fragment>
                 }
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 9e4b9f4b8..30c418eef 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1143,7 +1143,7 @@ class CommonWorkSetting extends Component{
                 rules={rules}
                 course_group={adaptered_group_settings}
                 rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
-                flagPageEdit={true}
+                flagPageEdit={startEditFlag}
                 moduleName="作业"
               ></PollDetailTabForthRules>
             }
diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index 5d904a36b..1d61bc428 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -173,7 +173,8 @@ class CCommentItem extends Component{
 		return parent.journals.map(item => {
 			// <div>{item.content} {item.user_info.user_name}</div>
 								
-			// src={getImageUrl(`images/${item.image_url}`)} 
+			// src={getImageUrl(`images/${item.image_url}`)}
+			const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url;
 			return (
 				<div className="comment_item_cont appraise df clearfix" key={item.id}>
 					<div className="J_Comment_Face fl">
@@ -184,7 +185,7 @@ class CCommentItem extends Component{
 							</a>
 						: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
 							<img alt="用户头像" height="50" 
-								src={`/images/${item.user_info.user_image_url}`}
+								src={imgSrc}
 							width="50"/>
 						</a>}
 					</div>
diff --git a/public/react/src/modules/courses/coursesHome/CoursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js
index a2f664c0a..d4e4609f6 100644
--- a/public/react/src/modules/courses/coursesHome/CoursesHome.js
+++ b/public/react/src/modules/courses/coursesHome/CoursesHome.js
@@ -119,7 +119,6 @@ class CoursesHome extends Component{
 												height: 300px;
 												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
 											  background-color: #081C4B;
-												background-size: cover;
 												background-position: center;
 												background-repeat: no-repeat;
 										}
diff --git a/public/react/src/modules/courses/exercise/yslexercisetable.css b/public/react/src/modules/courses/exercise/yslexercisetable.css
index 7092815d0..f984ba970 100644
--- a/public/react/src/modules/courses/exercise/yslexercisetable.css
+++ b/public/react/src/modules/courses/exercise/yslexercisetable.css
@@ -58,5 +58,5 @@
 .columnstwoachievement{
     width: 199px;
     text-align: right !important;
-    padding-right: 60px !important;
+    padding-right: 97px !important;
 }
diff --git a/public/react/src/modules/moop_cases/CaseList.js b/public/react/src/modules/moop_cases/CaseList.js
index f0b58d9f4..fe2331d9a 100644
--- a/public/react/src/modules/moop_cases/CaseList.js
+++ b/public/react/src/modules/moop_cases/CaseList.js
@@ -98,7 +98,18 @@ class CaseList extends Component{
 
     return(
       <React.Fragment>
-        <img src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)} width="100%" />
+				<style>
+					{
+						`
+						.imgmoop_cases{width: 100%;
+						height: 300px;
+						background-color: #000a4f;
+						background-position: 50%;
+						background-repeat: no-repeat;}
+						`
+					}
+				</style>
+        <img className={"imgmoop_cases"} src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)}/>
 				<div className="educontent">
           <div className="edu-back-white mb30 mt30">
             <p className="padding20-30 clearfix bor-bottom-greyE">
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 2c6372d66..fc633c975 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -872,7 +872,6 @@ submittojoinclass=(value)=>{
 			}
 		}
 
-	  // console.log("NewHeadergetHelmetapi432423423423");
     // console.log(mygetHelmetapi2);
 		// console.log("NewHeadermygetHelmetapi123123123123");
 
@@ -1234,11 +1233,11 @@ submittojoinclass=(value)=>{
               </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===undefined?"":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`}>我的翻转课堂</Link></li>}
                 {/* p 老师  l 学生 */}
-                <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>
-                <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
-								<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>
+								{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`}>我的实践课程</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>
@@ -1290,7 +1289,7 @@ submittojoinclass=(value)=>{
                   {this.props.Headertop===undefined?"":
 										pathstype===true?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
                   }
-                  <li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</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>
                 <ul className="fl with50 edu-txt-center">
 
@@ -1307,9 +1306,9 @@ submittojoinclass=(value)=>{
 
 
                   {/*  /courses/join_course_multi_role */}
-                  <li>
+									{this.props.user&&this.props.user.main_site===true?<li>
                   <a onClick={this.tojoinitem}>加入开发项目</a>
-                  </li>
+                  </li>:""}
 									{tojoinitemtype===true?<Modal
                     keyboard={false}
                     title="加入项目"
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index d79f7115f..16b70895f 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -132,11 +132,11 @@ class InfosBanner extends Component{
                 onClick={() => this.setState({moduleName: 'paths'})}
                 to={`/users/${username}/paths`}>实践课程</Link>
             </li>}
-            <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
+						{this.props.user&&this.props.user.main_site===true?<li className={`${moduleName == 'projects' ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'projects'})}
                 to={`/users/${username}/projects`}>开发项目</Link>
-            </li>
+            </li>:""}
             {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
             {/*  <Link*/}
             {/*    onClick={() => this.setState({moduleName: 'package'})}*/}