diff --git a/app/controllers/competitions/certificates_controller.rb b/app/controllers/competitions/certificates_controller.rb
index 68dad41c1..7572d8bbb 100644
--- a/app/controllers/competitions/certificates_controller.rb
+++ b/app/controllers/competitions/certificates_controller.rb
@@ -1,6 +1,11 @@
 class Competitions::CertificatesController < Competitions::BaseController
   def personal
-    prize_user = CompetitionPrizeUser.find_by!(user: current_user, id: params[:id])
+    prize_user =
+      if current_user.admin_or_business?
+        CompetitionPrizeUser.find(params[:id])
+      else
+        CompetitionPrizeUser.find_by!(user: current_user, id: params[:id])
+      end
     return render_not_found unless prize_user.certificate_exist?
 
     team = prize_user.competition_team
@@ -12,7 +17,7 @@ class Competitions::CertificatesController < Competitions::BaseController
 
   def team
     team = CompetitionTeam.find(params[:id])
-    return render_forbidden unless team.team_members.exists?(user_id: current_user.id)
+    return render_forbidden unless current_user.admin_or_business? || team.team_members.exists?(user_id: current_user.id)
     return render_not_found unless team.certificate_exists?
 
     prize = team.competition_prize_users.first.competition_prize
diff --git a/app/controllers/trustie_hacks_controller.rb b/app/controllers/trustie_hacks_controller.rb
index ebc7f1578..f427caf72 100644
--- a/app/controllers/trustie_hacks_controller.rb
+++ b/app/controllers/trustie_hacks_controller.rb
@@ -10,7 +10,7 @@ class TrustieHacksController < ApplicationController
     limit = params[:limit] || 16
 
     hacks = @hackathon.trustie_hacks
-    @hackathon_users_count = hacks.sum(:hack_users_count)
+    @hackathon_users_count = hacks ? 0 : hacks.sum(:hack_users_count)
 
     @hacks = hacks.page(page).per(limit)
 
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 73c707c9b..004cd91c0 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -1,4 +1,4 @@
-import { from } from '_array-flatten@2.1.2@array-flatten';
+//import { from } from '_array-flatten@2.1.2@array-flatten';
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index edc1fc81b..13c201cd0 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -421,7 +421,7 @@ class Selectresource extends Component{
 									<Radio style={radioStyle} value={0}>
 										立即发布
 									</Radio>
-									<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+									<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""} >
 									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 										<span className={"mr5"}>延期发布</span>
 										<DatePicker
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 929a19ffa..ea87e8bb2 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -529,7 +529,7 @@ class Selectsetting extends Component{
 									<Radio style={radioStyle} value={0}>
 										立即发布
 									</Radio>
-									<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+									<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
 										<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 											<span className={"mr5"}>延期发布</span>
 											<DatePicker
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index ba4526c82..a0a62048b 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -398,7 +398,7 @@ class Sendresource extends Component{
 								<Radio style={radioStyle} value={0}>
 									立即发布
 								</Radio>
-								<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
 								<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 									<span className={"mr5"}>延期发布</span>
 									<DatePicker
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 940e70c9a..1fa52670e 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -675,22 +675,24 @@ class LoginDialog extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./WeChat.png')}  alt="微信登录"/>
 														</a>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
-															<img src={require('./qq.png')}  alt="qq登录"/>
-														</a>
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
+														{/*</a>*/}
 													</div>
-												</p>:<p className="clearfix mt20">
-
-														<span className={"startlogin"}>————————  快速登录  ————————</span>
-														<div className={"mt10"}>
-															{/*<a onClick={()=>this.openweixinlogin()}>*/}
-																{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-															{/*</a>*/}
-															<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>
-																<img src={require('./qq.png')}  alt="qq登录"/>
-															</a>
-														</div>
-													</p>}
+												</p>:""}
+
+												{/*<p className="clearfix mt20">*/}
+
+														{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
+														{/*<div className={"mt10"}>*/}
+															{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
+														{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
+														{/*/!*</a>*!/*/}
+														{/*<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
+														{/*</a>*/}
+													{/*</div>*/}
+													{/*</p>*/}
 
                         </form>}
 												{weixinlogin===true?<iframe
diff --git a/public/react/src/modules/page/readme.txt b/public/react/src/modules/page/readme.txt
index 882c48ee5..f5e5646e9 100644
--- a/public/react/src/modules/page/readme.txt
+++ b/public/react/src/modules/page/readme.txt
@@ -1,5 +1,5 @@
 state说明
-    tasks详情接口
+    顶层state--tasks详情接口
         allowed_unlock  为true时，才允许非管理员用户解锁隐藏测试集
         discusses_count 总评论数
 
@@ -124,6 +124,28 @@ state说明
         user                当前关卡所属用户的信息
         user_praise         当前用户是否点赞
 
+    /MainContentContainer 里的state
+        repositoryCode: '',
+        open: false,			// 繁忙等级等提示用Dialog，考虑重构封装到根组件
+        gameBuilding: false, // 评测中标志
+        codeStatus: SAVED, //  0 已修改  1 保存中  2 已保存   3 保存失败
+
+        codeLoading: true,		 			// code加载中
+        readRepoTimeout: false,	            // 加载代码轮训超时
+        resetCodeDialogOpen: false,			// 重新加载初始代码弹框的bool控制
+        resetPassedCodeDialogOpen: false,	// 重新加载上次通过的代码的bool控制
+
+        isEditablePath: true                // 当前文件是否可编辑
+
+    CodeRepositoryViewContainer 里的state
+        drawerOpen: false,                  // 代码目录Drawer的bool控制 repoFilesDrawer
+        loadingFirstRepoFiles: false,       // 代码目录树加载中的bool控制
+        fileTreeData: "",                   // 目录树节点数据[]
+        fileTreeSelectedKeys: [],           // 目录树被选择的节点的key
+        codeRepositoryViewExpanded: false,  --
+        tabIndex: 0,                        // tab值
+        settingDrawerOpen: false            // 设置面板Drawer的bool控制
+        
 -------------- -------------- -------------- -------------- -------------- -------------- -------------- -------------- --------------         
 
 TPIContextProvider
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 2b140d93f..f29e9311e 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -1161,16 +1161,16 @@ export default class TPMevaluation extends Component {
 																		placeholder="输入"
 																		value={item.input}
 																		id={"textareavalue"+key}
-																		autoHeight="true"
-																		autoSize={{ minRows: 3, maxRows: 5 }}
+																		// autoHeight="true"
+																		rows={3}
 																		onInput={(e)=>this.evaluationoninputvalue(e,key,"sr")}
 													></TextArea>
 													<TextArea className="textareavalue" name="test_set[output][]"
 																		placeholder="预期输出"
 																		value={item.output}
 																		id={key+"textareavalue"}
-																		autoHeight="true"
-																		autoSize={{ minRows: 3, maxRows: 5 }}
+																		// autoHeight="true"
+																		rows={5}
 																		onInput={(e)=>this.evaluationoninputvalue(e,key,"yq")}
 													></TextArea>
 													<div className="clearfix lineh-30">
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 55a42b62d..9a11ac91a 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -1057,26 +1057,26 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:<p className="clearfix mb10 textcenter">
-
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
 														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
 													</div>
-												</p>}
+												</p>:""}
                       </div>
                   }
 
+								{/*<p className="clearfix mb10 textcenter">*/}
 
+									{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
+									{/*<div className={"mt10"}>*/}
+										{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
+										{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
+										{/*/!*</a>*!/*/}
+										{/*<a onClick={()=>this.openphoneqqlogin()}>*/}
+											{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+										{/*</a>*/}
+									{/*</div>*/}
+								{/*</p>*/}
 
 
 
@@ -1237,24 +1237,29 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:<p className="clearfix mb10 textcenter">
-
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
 														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
 													</div>
-												</p>}
+												</p>:""}
                       </div>
                   }
+
+
+								{/*<p className="clearfix mb10 textcenter">*/}
+
+									{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
+									{/*<div className={"mt10"}>*/}
+										{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
+										{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
+										{/*/!*</a>*!/*/}
+										{/*<a onClick={()=>this.openphoneqqlogin()}>*/}
+											{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+										{/*</a>*/}
+									{/*</div>*/}
+								{/*</p>*/}
+                  {/**/}
+
 								{weixinlogin===true?<iframe
 									className={"weixinheight390 mt20"}
 									frameBorder="0"