diff --git a/public/react/src/modules/help/ContactUs.js b/public/react/src/modules/help/ContactUs.js
index 04e3404fe..7f579bcf1 100644
--- a/public/react/src/modules/help/ContactUs.js
+++ b/public/react/src/modules/help/ContactUs.js
@@ -72,7 +72,7 @@ class ContactUs extends React.Component {
                     <div className="contact-item-label">公司地址</div>
                     <div className="contact-item-content">
                       <Row>
-                        <Col span={12}>{ address }</Col>
+                        <Col span={12}>长沙高新开发区尖山路39号长沙中电软件园一期13栋201室</Col>
                       </Row>
                     </div>
                   </div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 9c5652aaf..7a3c545ce 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1187,7 +1187,7 @@ submittojoinclass=(value)=>{
 							onBlur={(e)=>this.hideshowSearchOpen(e)}	onMouseLeave={()=>this.setevaluatinghides()}>
 							<Search
 								id={"HeaderSearchs"}
-								placeholder="实践课程/课堂/实训项目/交流问答"
+								placeholder="实践课程/翻转课堂/实训项目/交流问答"
 								onInput={()=>this.onKeywordSearchKeyDowns()}
 								onSearch={(value) => this.onKeywordSearchKeyDown(value)}
 								// onPressEnter={this.onKeywordSearchKeyDown}
@@ -1233,10 +1233,10 @@ submittojoinclass=(value)=>{
               </a>
               <ul className="edu-menu-list" style={{top:'60px'}}>
                 {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
-								{coursestypes===true?"":<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`}>{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`}>我的实践课程</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'}}>
@@ -1284,17 +1284,17 @@ submittojoinclass=(value)=>{
               <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===true?"":<li><a  onClick={(url)=>this.getUser("/courses/new")}>新建课堂</a></li>}
+									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===true?"":<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")}>新建实训项目</a></li>}
                   {this.props.Headertop===undefined?"":
-										pathstype===true?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
+										pathstype===true?"":this.props.user&&this.props.user.main_site===true||this.props.user&&this.props.user.admin===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}>加入课堂</a>
+                    <a onClick={this.tojoinclass}>{this.props.user&&this.props.user.main_site===false?"加入课堂":"加入翻转课堂"}</a>
                   </li>}
 
                   {Addcoursestypes===true?<Addcourses
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 69f54bd77..4408265ce 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -153,7 +153,7 @@ export function TPMIndexHOC(WrappedComponent) {
         window.addEventListener('keyup', this.keyupListener)
 
 	        if(this.props.match.path==="/"){
-             document.title="创新源于实践";
+              // document.title="创新源于实践";
             }else if(this.props.match.path==="/403"){
 	        	 document.title="你没有权限访问";
             }else if(this.props.match.path==="/nopage"){
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 803e1caf2..4306fc6e3 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -118,7 +118,7 @@ class TPMRightSection extends Component {
 							}
 
 
-							{this.props.user&&this.props.user.main_site===true?<div className="padding20 edu-back-white mb10 mt10" style={{
+						<div className="padding20 edu-back-white mb10 mt10" style={{
 								display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
 							}}>
 								<p className="mb20 font-16 clearfix">所属课程</p>
@@ -159,7 +159,7 @@ class TPMRightSection extends Component {
 										})
 									}
 								</div>
-							</div>:""}
+							</div>
 
 		       {TPMRightSectionData === undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "" :
 						 this.props.user&&this.props.user.main_site===true?<div className="padding20 edu-back-white"
diff --git a/public/react/src/modules/user/AccountProfile.js b/public/react/src/modules/user/AccountProfile.js
index 04c9e51f4..ea8d20b8a 100644
--- a/public/react/src/modules/user/AccountProfile.js
+++ b/public/react/src/modules/user/AccountProfile.js
@@ -67,7 +67,7 @@ render() {
 					<div className="task-popup-content">
 						<p className="task-popup-text-center font-16"> {content || '您需要去完善您的个人资料，才能使用此功能'}</p>
 						<div className="clearfix mt30 edu-txt-center">
-							<a  className="task-btn mr30" onClick={()=>this.gotoback()}>{this.props.AccountProfiletype&&this.props.AccountProfiletype===true?"稍后完善":"取消"}</a>
+							<a  className="task-btn mr30" onClick={()=>this.gotoback()}>稍后完善</a>
 							<a className="task-btn task-btn-orange"  href={ okHref || "/account/profile/edit" }> {okText || '立即完善'}</a>
 						</div>
 					</div>
diff --git a/public/react/src/modules/user/account/AccountNav.js b/public/react/src/modules/user/account/AccountNav.js
index e069cdeb2..c4d8b0630 100644
--- a/public/react/src/modules/user/account/AccountNav.js
+++ b/public/react/src/modules/user/account/AccountNav.js
@@ -82,7 +82,7 @@ class AccountNav extends Component {
               <React.Fragment>
                 <div className="accountInfo">
                   <AccountImg src={basicInfo.avatar_url} {...this.props}></AccountImg>
-                  {/*<span className="name">{basicInfo.name || (current_user ? current_user.login : '')}</span>*/}
+                  <span className="name">{basicInfo.name || (current_user ? "" : '')}</span>
                   <span className="role">{basicInfo.technical_title}</span>
                 </div>