diff --git a/public/react/public/index.html b/public/react/public/index.html
index 1e49b874c..ff03855aa 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -55,7 +55,7 @@
 
     <!-- <link href="/react/build/css/iconfont.css" rel="stylesheet" type="text/css"> -->
 
-    <link href="http://47.96.87.25:48080/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
+    <!--<link href="http://47.96.87.25:48080/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">-->
 
     <!--<link href="https://pandao.github.io/editor.md/examples/css/style.css" rel="stylesheet" type="text/css">-->
 
diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js
index b332c50a8..51769b605 100644
--- a/public/react/src/context/TPIContextProvider.js
+++ b/public/react/src/context/TPIContextProvider.js
@@ -714,10 +714,10 @@ pop_box_new(htmlvalue, 480, 182);
 	}
 
 	testSetUnlock() {
-		const { game } = this.state;
-		const url = `/v1/games/${game.identifier}/check_test_sets.json`
+		const { game, challenge } = this.state;
+		const url = `/tasks/${game.identifier}/check_test_sets.json`
 		axios.get(url, {
-    			withCredentials: true,
+    			// withCredentials: true,
     		})
 		  .then((response) => {
 				// TODO status -2 重复操作，直接解锁
@@ -727,12 +727,12 @@ pop_box_new(htmlvalue, 480, 182);
 			    	return;
 			    } else {
 			    	// 被扣除的金币，是负数
-			    	const deltaScore = response.data.score;
+			    	const deltaScore = -challenge.score * 5;
 					// output_sets
 					let { output_sets } = this.state;
 					output_sets = Object.assign({}, output_sets);
-					const test_sets_array = JSON.parse("[" + response.data.test_sets + "]");
-	  				output_sets.test_sets_array = test_sets_array;
+					// const test_sets_array = JSON.parse("[" + response.data.test_sets + "]");
+	  				output_sets.test_sets_array = response.data.test_sets;
 			    	this.setState({ 
 						output_sets: output_sets,
 			    		grade: this.state.grade + deltaScore,
diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index 20f48cd92..711ece6fa 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -323,11 +323,14 @@ class Comments extends Component {
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										{ item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
+										{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
+
+										{/* { item.hidden && ((this.props.onlySuperAdminCouldHide && !item.isSuperAdmin) 
 												|| !this.props.onlySuperAdminCouldHide && item.admin === false && (item.manager === false || item.manager == undefined))
 											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-											: <div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
-										}
+											:  */}
+											<div  className={"break_word_comments  markdown-body"} dangerouslySetInnerHTML={{__html: _content}}></div>
+										{/* } */}
 										<div className="cl"></div>
 									</div>
 								</div>
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index dd37c441c..1165eae5a 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -176,13 +176,13 @@ class Fileslistitem extends Component{
               height: 50px;
             }
           `}</style>
-                <a href={"/users/"+this.props.user.login} alt="用户"
-                   style={{"width": "50px", "height": "50px", "display": "block", margin: "0 10px"}}>
-                    <img
-                        alt="1?1529221779" className="panel-list-img mr15" height="50"
-                        src={getImageUrl("images/"+discussMessage.author.image_url)} width="50"
-                    ></img>
-                </a>
+                {/*<a href={"/users/"+this.props.user.login} alt="用户"*/}
+                   {/*style={{"width": "50px", "height": "50px", "display": "block", margin: "0 10px"}}>*/}
+                    {/*<img*/}
+                        {/*alt="1?1529221779" className="panel-list-img mr15" height="50"*/}
+                        {/*src={getImageUrl("images/"+discussMessage.author.image_url)} width="50"*/}
+                    {/*></img>*/}
+                {/*</a>*/}
 
                 <style>{`
             .boardsList .contentSection{
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 96338818f..c4b5d10b0 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -273,6 +273,7 @@ class Fileslists extends Component{
               checkAllValue:false
             })
             this.props.showNotification("删除成功");
+						this.props.updataleftNavfun()
           }
         })
         .catch(function (error) {
@@ -538,6 +539,7 @@ class Fileslists extends Component{
             })
 						this.updatafiled()
             this.props.showNotification('资源移动成功')
+						this.props.updataleftNavfun()
           }
         })
   }
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 34c2d6154..773fa52fe 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -80,7 +80,8 @@ function buildColumns(that, student_works) {
 					overflow: 'hidden',
 					textOverflow: 'ellipsis',
 					whiteSpace: 'nowrap',
-          width: '98px'
+          width: '98px',
+          margin: '0 auto'
 					 }} title={text}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
@@ -99,7 +100,8 @@ function buildColumns(that, student_works) {
         <span>
           <a href="javascript:;"  
             title={record.student_id}
-            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'}}
+            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'
+                , margin: '0 auto'}}
           >{record.student_id}</a>
       </span>
       ),
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index c9c5c7b45..3f65faafa 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -659,6 +659,8 @@ render(){
           <Form.Item
             label="内容"
             style={{marginBottom: '4px'}}
+            className="mdInForm"
+
           >
             {getFieldDecorator('description', {
               rules: [{
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index cc4aff4f9..7fbe33a67 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -88,10 +88,14 @@ class commonWork extends Component{
     let {page,search,order}=this.state;
     this.getList(page,search,order);
   }
-  useBankSuccess = () => {
+  useBankSuccess = (checkBoxValues, newWorkIdArray) => {
     this.setState({
-      page:1
+      page:1,
+      checkBoxValues: newWorkIdArray
+    }, () => {
+      this.refs['publishModalRef'].open()
     })
+    
     let {search, order}=this.state;
     this.getList(1, search, order);
   }
@@ -418,7 +422,7 @@ class commonWork extends Component{
                       onClick={this.onWorkDelete}>删除</a>
                 </li>
                 <li className="li_line">
-                  <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
+                  <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
                       isPublish={true} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
                 <li className="li_line">
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 26501fe99..83d5ebbde 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -930,6 +930,14 @@ a.white-btn.use_scope-btn:hover{
 .ml22{
     margin-left:22px;
 }
+/* antd样式重置 */
+/* 字体 https://www.trustie.net/issues/21668/ */
+pre,
+code,
+kbd,
+samp {
+    font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 /* FORM START */
 .ant-form label{
     /* 为了覆盖antd的样式，这里使用了important，TODO */
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 9a1de2846..1ae9e34fb 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -34,8 +34,8 @@ if (!window['indexHOCLoaded']) {
       .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`));
 
   // index.html有加载
-    // $('head').append($('<link rel="stylesheet" type="text/css" />')
-    //     .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
+	$('head').append($('<link rel="stylesheet" type="text/css" />')
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index e70454056..0f00d1c25 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -41,11 +41,12 @@ function md_clear_data(k,mdu,id){
     var id1 = "#e_tip_"+id;
     var id2 = "#e_tips_"+id;
     if(k == 'content'){
-        $(id2).html("");
+        $(id2).html("　");
     }else{
-        $(id1).html("");
+        $(id1).html("　");
     }
 }
+window.md_clear_data = md_clear_data
 // editor 存在了jquery对象上，应用不需要自己写md_rec_data方法了
 function md_rec_data(k, mdu, id) {
     if (window.sessionStorage.getItem(k + mdu) !== null) {
@@ -80,8 +81,8 @@ function md_elocalStorage(editor,mdu,id){
                 var id1 = "#e_tip_"+id;
                 var id2 = "#e_tips_"+id;
 
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
-                $(id2).html("");
+                $(id2).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存   ");
+                // $(id2).html("");
             }
         },10000);
 
@@ -302,8 +303,8 @@ export default class TPMMDEditor extends Component {
                     </div>
                 </div>
                 <div className={"fr rememberTip"}>
-                    {noStorage == true ? '　' : <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
-                    {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
+                    {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>}
+                    {/* {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12">　</p>} */}
                 </div>
             </React.Fragment>
         )