From 265daa677cfd8682808d19b6478d2db022ac10f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 22 Jul 2019 16:05:09 +0800
Subject: [PATCH 01/21] b

---
 public/react/src/modules/tpm/NewHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c284ace35..b01dba4e0 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -270,7 +270,7 @@ class NewHeader extends Component {
       console.log(error);
     })
   }
-  
+
   hideAddcoursestypes=()=>{
     this.setState({
       Addcoursestypes:false

From d080387677bb0a90f1262b61e9ed8f8e180860e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 22 Jul 2019 18:58:53 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=87=B3=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/paths/PathDetail/sendPanel.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js
index ff8bfc6c9..84c7d8e23 100644
--- a/public/react/src/modules/paths/PathDetail/sendPanel.js
+++ b/public/react/src/modules/paths/PathDetail/sendPanel.js
@@ -2,6 +2,7 @@ import React,{ Component } from "react";
 import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd";
 import axios from 'axios';
 import { SnackbarHOC } from 'educoder';
+import moment from 'moment';
 import Modals from '../../modals/Modals';
 const Option = Select.Option;
 const CheckboxGroup = Checkbox.Group;
@@ -148,14 +149,16 @@ class sendPanel extends Component{
           destroyOnClose={true}
         >
           <div className="newupload_conbox">
-            <div className="mb20" onMouseLeave={this.closeList}>
+            <div className="mb20"
+								 // onMouseLeave={this.closeList}
+						>
               <Select
               placeholder="请选择您要发送的课堂" 
               style={{"width":"100%"}} 
               onSelect={this.selectCloseList}
-              onMouseEnter={this.openList}
+              // onMouseEnter={this.openList}
               defaultOpen={false}
-              open={openSearch}
+              // open={openSearch}
               optionLabelProp="name"
               >
               {
@@ -164,7 +167,9 @@ class sendPanel extends Component{
                       <Option key={item.course_id} id={key} name={item.course_name}>
                         <Row>
                           <Col className="fl with70 task-hide">{item.course_name}</Col>
-                          <Col className="fl color-grey-9 with30 edu-txt-center">{item.created_at}</Col>
+                          <Col className="fl color-grey-9 with30 edu-txt-center">
+														{moment( item.created_at ).format('YYYY-MM-DD HH:mm')}
+                          </Col>
                         </Row>
                       </Option>                    
                   )

From ffc36c5cf2c8e64fd204e04c54189a5d6cc55b60 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 09:16:56 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 4 ++--
 app/helpers/subjects_helper.rb         | 4 ++--
 app/views/subjects/show.json.jbuilder  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index b372eb2c0..064061058 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -82,8 +82,8 @@ class SubjectsController < ApplicationController
     @is_creator = current_user.creator_of_subject?(@subject)
     # 合作团队
     @members = @subject.subject_members.includes(:user)
-    shixun_ids = @subject.shixuns.published.pluck(:id)
-    challenge_ids = Challenge.where(shixun_id: shixun_ids).pluck(:id)
+    @shixuns = @subject.shixuns.published.pluck(:id)
+    challenge_ids = Challenge.where(shixun_id: @shixuns).pluck(:id)
     # 实训路径中的所有实训标签
     @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
     # 用户获取的实训标签
diff --git a/app/helpers/subjects_helper.rb b/app/helpers/subjects_helper.rb
index f0ecd1174..c464c7a7e 100644
--- a/app/helpers/subjects_helper.rb
+++ b/app/helpers/subjects_helper.rb
@@ -1,10 +1,10 @@
 module SubjectsHelper
 
   # 实训路径的发布状态
-  def publish_status subject, is_manager, user
+  def publish_status subject, is_manager, user, shixuns
     status = -1
     if is_manager
-      status = 0 if subject.status == 0 && subject.shixuns_count > 0
+      status = 0 if subject.status == 0 && shixuns.count > 0
       status = 1 if subject.status == 1
       status = 2 if subject.status == 2 && user.admin?
     end
diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder
index 14eb1942f..cafb08942 100644
--- a/app/views/subjects/show.json.jbuilder
+++ b/app/views/subjects/show.json.jbuilder
@@ -6,7 +6,7 @@ json.subject_score @subject.all_score
 json.member_count @subject.member_count
 
 json.allow_delete @is_creator && (@subject.status != 2 || @user.admin?)
-json.publish_status publish_status(@subject, @is_creator, @user)
+json.publish_status publish_status(@subject, @is_creator, @user, @shixuns)
 json.allow_statistics @user.manager_of_subject?(@subject)
 json.allow_send @user.logged?
 json.allow_visit @user.manager_of_subject?(@subject) || @user.admin? || @subject.status > 1

From 314dda5a358bf9573b20f56819928c3fe816a3bc Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 09:22:30 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_commons/group_list.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_commons/group_list.json.jbuilder b/app/views/homework_commons/group_list.json.jbuilder
index b5fead17e..d7e2427fd 100644
--- a/app/views/homework_commons/group_list.json.jbuilder
+++ b/app/views/homework_commons/group_list.json.jbuilder
@@ -7,7 +7,7 @@ json.group_list do
   end
 end
 # 未分班展示情况放在最后
-if @course_groups.count != (@page -1)*@limit.to_i && @course_groups.count < @limit.to_i
+if @course_groups.count != (@page - 1)*@limit.to_i && @course_groups.count < @limit.to_i
   ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids)
   if ungroup_work_count > 0
     json.ungroup_list do

From d63881d85bbd1e67e51c7d1ab25565f5295f71a4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 09:27:32 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_commons/group_list.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/homework_commons/group_list.json.jbuilder b/app/views/homework_commons/group_list.json.jbuilder
index d7e2427fd..aa951bf7d 100644
--- a/app/views/homework_commons/group_list.json.jbuilder
+++ b/app/views/homework_commons/group_list.json.jbuilder
@@ -7,7 +7,7 @@ json.group_list do
   end
 end
 # 未分班展示情况放在最后
-if @course_groups.count != (@page - 1)*@limit.to_i && @course_groups.count < @limit.to_i
+if @course_groups.count != (@page.to_i - 1)*@limit.to_i && @course_groups.count < @limit.to_i
   ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids)
   if ungroup_work_count > 0
     json.ungroup_list do

From 62c9ba34c1fd959453b7894633d4b50c36e90806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:06:07 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTaskssettinglist.js       | 10 ++++-----
 public/react/src/modules/login/LoginDialog.js | 21 +++++++++++--------
 public/react/src/modules/tpm/NewHeader.js     |  8 +++----
 .../tpm/shixunchild/Challenges/Challenges.js  |  7 +++----
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 99c190063..291095008 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1203,14 +1203,14 @@ class GraduationTaskssettinglist extends Component{
 												{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0?<li className="clearfix">
 													<span className="fl mr10 color-grey-8">分班情况：</span>
 
-													<span className="fl mr25">
-                           <a  id="graduation_comment_no_limit" className={course_group===null||course_group===undefined?"pl10 pr10 check_on":"pl10 pr10 "} onClick={()=>this.groupgroup([])}>不限</a>
-                         </span>
+													<CheckboxGroup value={course_group} onChange={(e)=>this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
+													 <span className="fl mr25">
+														 <a  id="graduation_comment_no_limit" className={course_group===null||course_group===undefined?"pl10 pr10 check_on":"pl10 pr10 "} onClick={()=>this.groupgroup([])}>不限</a>
+													 </span>
 
-													<CheckboxGroup value={course_group} onChange={(e)=>this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{ paddingTop: '4px'}}>
 														{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
 															return(
-																<span key={key}>
+																<span key={key}  className={"mt10"}>
                                 <Checkbox value={item.course_group_id} key={item.course_group_id} className="fl ">{item.group_group_name}
 	                                <span>({item.count})</span>
                                 </Checkbox>
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 3a401c7de..d587dc337 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -317,15 +317,18 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose = () => {
-			if(this.props.match===undefined){
-				window.location.href="/";
-			}else if(this.props.match.path==="/"){
-        this.setState({
-          isRender: false
-        })
-      }else{
-      window.location.href="/";
-      }
+			// if(this.props.match===undefined){
+			// 	window.location.href="/";
+			// }else if(this.props.match.path==="/"){
+      //   this.setState({
+      //     isRender: false
+      //   })
+      // }else{
+      // window.location.href="/";
+      // }
+			this.setState({
+				isRender: false
+			})
     }
 
     loginEDU=()=>{
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index b01dba4e0..5f7f485f8 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -534,10 +534,10 @@ submittojoinclass=(value)=>{
 
       <div className="newHeader" id="nHeader"  >
 
-              <LoginDialog
-                  {...this.state}
-                  {...this.props}
-              />
+              {/*<LoginDialog*/}
+                  {/*{...this.state}*/}
+                  {/*{...this.props}*/}
+              {/*/>*/}
 
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 1935f2053..85b0920e0 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -470,11 +470,10 @@ class Challenges extends Component {
                             </span>
                         </div>
                         <div className="clearfix pl28">
-                          <span className="task-colspan">{item.passed_count}&nbsp;人完成挑战</span>
+													<span className="task-colspan"><span className={"color-orange"}>{item.passed_count}</span>&nbsp;人完成挑战</span>
                           <span
-                            className="task-colspan">{item.playing_count}&nbsp;人正在挑战</span>
-                          <span className="task-colspan"><span
-                            className="colspan-grey">经验值&nbsp;{item.score}</span></span>
+                            className="task-colspan"><span className={"color-orange"}>{item.playing_count}</span>&nbsp;人正在挑战</span>
+													<span className="task-colspan"><span>完成挑战可获得经验值&nbsp;<span className={"color-orange"}>{item.score}</span></span></span>
 
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}

From cea9bff7a439d8ea00647c9a7c893efb254237dd Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 23 Jul 2019 10:13:58 +0800
Subject: [PATCH 07/21] cache

---
 public/react/src/common/TextUtil.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js
index c711143d2..bd524c4a9 100644
--- a/public/react/src/common/TextUtil.js
+++ b/public/react/src/common/TextUtil.js
@@ -6,6 +6,9 @@ export function isImageExtension(fileName) {
 export function markdownToHTML(oldContent, selector) {
     window.$('#md_div').html('')
     // markdown to html
+    try {
+
+    
     var markdwonParser = window.editormd.markdownToHTML("md_div", {
         markdown: oldContent,
         emoji: true,
@@ -15,6 +18,11 @@ export function markdownToHTML(oldContent, selector) {
         flowChart: true,  // 默认不解析
         sequenceDiagram: true // 默认不解析
     });
+
+    } catch(e) {
+        console.error(e)
+    }
+    
     const content = window.$('#md_div').html()
     if (selector) {
         window.$(selector).html(content)

From 6921ab3ab5cd807b75a3387fc3305bd80c18cb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:26:05 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 1807d956c..970e64e3f 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2702,7 +2702,7 @@ class Listofworksstudentone extends Component {
 													<div className="edu-tab-con-box clearfix edu-txt-center">
 														<img className="edu-nodata-img mb20"
 																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">没有数据可以显示,,！</p>
+														<p className="edu-nodata-p mb30">没有数据可以显示！</p>
 													</div>
 												</div>
 

From d2c134d797092519de629c4d252d9545ad71df5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:26:30 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/Listofworksstudentone.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 970e64e3f..3865ee153 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2490,7 +2490,7 @@ class Listofworksstudentone extends Component {
 										<div className="mh650 edu-back-white">
 											<div className="edu-tab-con-box clearfix edu-txt-center">
 												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">没有数据可以显示.！</p>
+												<p className="edu-nodata-p mb30">没有数据可以显示！</p>
 											</div>
 										</div>
 
@@ -2892,7 +2892,7 @@ class Listofworksstudentone extends Component {
 													<div className="edu-tab-con-box clearfix edu-txt-center">
 														<img className="edu-nodata-img mb20"
 																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">没有数据可以显示..！</p>
+														<p className="edu-nodata-p mb30">没有数据可以显示！</p>
 													</div>
 												</div>
 

From e43839d72009a5bf6925fbec5954aa0f493f216e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 23 Jul 2019 10:27:59 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/config/webpack.config.prod.js           |  1 +
 .../courses/shixunHomework/ShixunHomeworkPage.js     | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 0abd707af..e1be720a4 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -300,6 +300,7 @@ module.exports = {
           comments: false
         },
         warnings: false,
+        drop_console: true,
         compress: {
           drop_debugger: false,
           drop_console: false
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index f15ec9f87..3792f8635 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -59,10 +59,10 @@ class ShixunHomeworkPage extends Component {
 		// console.log(teacherdata);
 
 		this.setState({
-			jobsettingsdatapage: jobsettingsdata,
-			teacherdatapage: teacherdata,
-			code_review: teacherdata.code_review,
-			view_report: teacherdata.view_report,
+			jobsettingsdatapage: jobsettingsdata.data.message!==undefined?undefined:jobsettingsdata,
+			teacherdatapage:  teacherdata.message!==undefined?undefined:teacherdata,
+			code_review: teacherdata.code_review!==undefined?teacherdata.code_review :false,
+			view_report: teacherdata.view_report!==undefined? teacherdata.view_report:false,
 		})
 	}
 
@@ -116,7 +116,9 @@ class ShixunHomeworkPage extends Component {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
 
 		const isAdmin = this.props.isAdmin();
-
+		// console.log(119)
+		// console.log(jobsettingsdatapage);
+		// console.log(teacherdatapage);
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>

From bd1942ce31c1eeb793612b1373159ddc6ed8523d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 23 Jul 2019 10:31:34 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/ShixunHomeworkPage.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 3792f8635..91edc45fe 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -67,7 +67,7 @@ class ShixunHomeworkPage extends Component {
 	}
 
 	componentDidMount() {
-		console.log("父组件加载框");
+		// console.log("父组件加载框");
 		const query = this.props.location.search;
 		const type = query.split('?tab=');
 		// let sum = []

From 33f9d9289fc498df6ae3a2e6fffae0b4ae342f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:38:13 +0800
Subject: [PATCH 12/21] .

---
 public/react/config/webpack.config.prod.js                   | 5 ++---
 .../courses/coursesHome/{coursesHome.js => CoursesHome.js}   | 0
 .../coursesHome/{coursesHomeCard.js => CoursesHomeCard.js}   | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename public/react/src/modules/courses/coursesHome/{coursesHome.js => CoursesHome.js} (100%)
 rename public/react/src/modules/courses/coursesHome/{coursesHomeCard.js => CoursesHomeCard.js} (100%)

diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index e1be720a4..7b9795e80 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -300,10 +300,9 @@ module.exports = {
           comments: false
         },
         warnings: false,
-        drop_console: true,
         compress: {
-          drop_debugger: false,
-          drop_console: false
+          drop_debugger: true,
+          drop_console: true
         }
       }
     }),
diff --git a/public/react/src/modules/courses/coursesHome/coursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js
similarity index 100%
rename from public/react/src/modules/courses/coursesHome/coursesHome.js
rename to public/react/src/modules/courses/coursesHome/CoursesHome.js
diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js
similarity index 100%
rename from public/react/src/modules/courses/coursesHome/coursesHomeCard.js
rename to public/react/src/modules/courses/coursesHome/CoursesHomeCard.js

From 063af419f54ab4fca8e8f3ed4d6b32aa44af029b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 10:43:46 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 064061058..54e9fe4b2 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -160,14 +160,11 @@ class SubjectsController < ApplicationController
       @shixuns = @shixuns.where(id: shixun_ids)
     end
 
-    @shixuns = @shixuns.reorder("created_at desc")
-    @shixuns_count = @shixuns.size
+    @shixuns_count = @shixuns.count
 
     ## 分页参数
     page  = params[:page] || 1
-    @shixuns = @shixuns.page(page).per(10)
-
-    @shixuns = @shixuns.includes(:myshixuns)
+    @shixuns = @shixuns.includes(:myshixuns).reorder("created_at desc").page(page).per(10)
   end
 
   def append_to_stage

From 526c87c76965eff74f3050e5925f1470b2128af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:45:16 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/ShixunModal.js      | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
index afba47723..56cecc51b 100644
--- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
@@ -29,11 +29,13 @@ class ShixunModal extends Component{
 
 		axios.get(url).then((result)=>{
 			if(result.status===200){
-				this.setState({
-					shixunmodallist:result.data,
-					hometypepvisible:false,
-					newshixunmodallist:result.data.shixun_list,
-				})
+				if(result.data.message===undefined){
+					this.setState({
+						shixunmodallist:result.data,
+						hometypepvisible:false,
+						newshixunmodallist:result.data.shixun_list,
+					})
+				}
 			}
 		}).catch((error)=>{
 			console.log(error);
@@ -59,18 +61,18 @@ class ShixunModal extends Component{
 			}
 		}).then((result)=>{
 			if(result.status===200){
+				if(result.data.message===undefined){
+					let shixun_list = result.data.shixun_list;
+					for (var i = 0; i < shixun_list.length; i++) {
+						newshixunmodallists.push(shixun_list[i])
+					}
+					this.setState({
+						shixunmodallist: result.data,
+						newshixunmodallist: newshixunmodallists,
+						hometypepvisible: false
+					})
 
-				let  shixun_list=result.data.shixun_list;
-				for(var i=0; i<shixun_list.length;i++){
-					newshixunmodallists.push(shixun_list[i])
 				}
-				this.setState({
-					shixunmodallist:result.data,
-					newshixunmodallist:newshixunmodallists,
-					hometypepvisible:false
-				})
-
-
 			}
 
 		}).catch((error)=>{

From 800417eff48ad41e7fba2a04a942d391dd015aca Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 10:49:48 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 54e9fe4b2..4e4d494ce 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -160,11 +160,14 @@ class SubjectsController < ApplicationController
       @shixuns = @shixuns.where(id: shixun_ids)
     end
 
+    @shixuns = @shixuns.reorder("created_at desc")
     @shixuns_count = @shixuns.count
 
     ## 分页参数
     page  = params[:page] || 1
-    @shixuns = @shixuns.includes(:myshixuns).reorder("created_at desc").page(page).per(10)
+    @shixuns = @shixuns.page(page).per(10)
+
+    @shixuns = @shixuns.includes(:myshixuns)
   end
 
   def append_to_stage

From a3939d427e6e4d9470cbf6fce1ca2b9ea63ef4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:50:57 +0800
Subject: [PATCH 16/21] .

---
 public/react/src/modules/tpm/TPMBanner.js     |   2 +-
 .../src/modules/tpm/shixuns/css/TPMBanner.css | 200 +++++++++---------
 2 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 866ca3583..23b228800 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -597,7 +597,7 @@ class TPMBanner extends Component {
                 </ul>
 
                 <div className="pr fl" id="commentsStar">
-
+									  <div className={"color-grey-c"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
                     <div className="rateYo">
                         <Rating value={star_info[0]} disabled allowHalf/>
                     </div>
diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
index 2f68f2fbb..c894eaace 100644
--- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -1,101 +1,101 @@
-.shixunsdiffcult{
-  width: 40px;
-  height: 21px;
-  overflow: hidden;
-  margin-left: 8px;
- }
-
- .rateYo{
-  text-align: center;
-  cursor: default;
-  width: 90px;
- }
-
- a:link, a:visited {
-  color: #05101a;
-}
-
-a:link{text-decoration:none;}
-
-a:visited{text-decoration:none;}
-
-a:hover{text-decoration:none;}
-
-a:active{text-decoration:none;}
-
-
-.next-rating-overlay .next-icon{
-  color: #FFA800!important;
-}
-
-.displayblock{
-  display:block;
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.totalScore{
-    justify-content: center;
-    align-items: center;
-    display: -webkit-flex;
-    height: 100%;
-}
-
-.next-progress-line{
-  width: 210px !important;
-  margin-left: 10px;
-  margin-top: 4px;
-}
-
-.next-progress-line-overlay-normal{
-  background-color: #FFA800  !important;
-}
-.next-rating-base-disabled{
-    cursor: default!important;
-}
-/*#challenge_begin {*/
-/*!*height: 40px !important;*!*/
-/*line-height: 30px;*/
-/*}*/
-.ant-modal-title{
-    font-size: 16px;
-    font-weight: bold !important;
-    color: #333;
-}
-
-.ml60{
-    margin-left:20px;
-}
-
-.marginauto{
-    margin:0 auto;
-}
-.margin152{
-    margin-left: 152px;
-}
-
-.margin-tp26{
-    margin-top: -26px;
-}
-.edu-h315{
-    height:315px;
-}
-
-.height39 {
-    height: 39px !important;
-}
-#commentsStar{
-    margin-top:33px;
-}
-.startbtnModal .ant-modal-content{
-    background: transparent;
-    box-shadow: 0 4px 12px transparent;
-}
-
-.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{
-    margin-left: 45%;
-}
-
-.mr51{
-    margin-right:51px;
+.shixunsdiffcult{
+  width: 40px;
+  height: 21px;
+  overflow: hidden;
+  margin-left: 8px;
+ }
+
+ .rateYo{
+  text-align: center;
+  cursor: default;
+  width: 90px;
+ }
+
+ a:link, a:visited {
+  color: #05101a;
+}
+
+a:link{text-decoration:none;}
+
+a:visited{text-decoration:none;}
+
+a:hover{text-decoration:none;}
+
+a:active{text-decoration:none;}
+
+
+.next-rating-overlay .next-icon{
+  color: #FFA800!important;
+}
+
+.displayblock{
+  display:block;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.totalScore{
+    justify-content: center;
+    align-items: center;
+    display: -webkit-flex;
+    height: 100%;
+}
+
+.next-progress-line{
+  width: 210px !important;
+  margin-left: 10px;
+  margin-top: 4px;
+}
+
+.next-progress-line-overlay-normal{
+  background-color: #FFA800  !important;
+}
+.next-rating-base-disabled{
+    cursor: default!important;
+}
+/*#challenge_begin {*/
+/*!*height: 40px !important;*!*/
+/*line-height: 30px;*/
+/*}*/
+.ant-modal-title{
+    font-size: 16px;
+    font-weight: bold !important;
+    color: #333;
+}
+
+.ml60{
+    margin-left:20px;
+}
+
+.marginauto{
+    margin:0 auto;
+}
+.margin152{
+    margin-left: 152px;
+}
+
+.margin-tp26{
+    margin-top: -26px;
+}
+.edu-h315{
+    height:315px;
+}
+
+.height39 {
+    height: 39px !important;
+}
+#commentsStar{
+    margin-top: -7px;
+}
+.startbtnModal .ant-modal-content{
+    background: transparent;
+    box-shadow: 0 4px 12px transparent;
+}
+
+.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{
+    margin-left: 45%;
+}
+
+.mr51{
+    margin-right:51px;
 }
\ No newline at end of file

From ac75d7173ee8f2c01393efd2d711b1749614ac33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 23 Jul 2019 10:55:08 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Shixunworkdetails/ShixunWorkModal.js        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index b60cb8261..f1d1c43f3 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -1,6 +1,7 @@
 import React,{ Component } from "react";
 import { Modal,Checkbox,notification} from "antd";
 import axios from 'axios';
+import {getImageUrl} from 'educoder';
 
 class ShixunWorkModal extends Component{
 	constructor(props){
@@ -251,6 +252,18 @@ class ShixunWorkModal extends Component{
 						</ul>
 
 						{course_groups===undefined?"":
+							group_list===undefined||JSON.stringify(group_list)==="[]"
+							?
+								<div id="forum_list" className="forum_table">
+									<div className=" edu-back-white">
+										<div className="edu-tab-con-box clearfix edu-txt-center">
+											<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+											<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+										</div>
+									</div>
+
+								</div>
+								:
 							<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
 									onScroll={this.contentViewScroll}
 							>
@@ -258,7 +271,9 @@ class ShixunWorkModal extends Component{
 
 								<Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit} value={group_ids}>
 									{
-										group_list===undefined?"":
+										group_list===undefined||JSON.stringify(group_list)==="[]"?
+										""
+											:
 											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
 													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>

From 62d0ecdab807e8b3eb52d30dfd1656b4e9002ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:58:28 +0800
Subject: [PATCH 18/21] .

---
 public/react/src/modules/tpm/shixuns/css/TPMBanner.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
index c894eaace..0492f20c3 100644
--- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -86,6 +86,8 @@ a:active{text-decoration:none;}
 }
 #commentsStar{
     margin-top: -7px;
+    width: 90px;
+    margin-bottom: 11px;
 }
 .startbtnModal .ant-modal-content{
     background: transparent;

From 6bc633b3b668e06dcff9ca4a24d5a80bef7772db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 10:58:55 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Index.js                   | 2 +-
 public/react/src/modules/courses/coursesHome/CoursesHome.js | 6 +++---
 .../src/modules/courses/coursesHome/CoursesHomeCard.js      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index 27424821f..017a36765 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -18,7 +18,7 @@ const ListPageIndex = Loadable({
 
 //课堂首页
 const CoursesHome = Loadable({
-    loader: () => import('./coursesHome/coursesHome'),
+    loader: () => import('./coursesHome/CoursesHome'),
     loading:Loading,
 })
 
diff --git a/public/react/src/modules/courses/coursesHome/CoursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js
index 994e14eb9..3f4b4ad12 100644
--- a/public/react/src/modules/courses/coursesHome/CoursesHome.js
+++ b/public/react/src/modules/courses/coursesHome/CoursesHome.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import {getImageUrl} from 'educoder';
-import CoursesHomeCard from "./coursesHomeCard.js"
+import CoursesHomeCard from "./CoursesHomeCard.js"
 import axios from 'axios';
 import {Input,Tooltip} from 'antd';
 import UpgradeModals from '../../modals/UpgradeModals';
@@ -10,7 +10,7 @@ import '@icedesign/base/lib/pagination/style.js';
 
 
 const Search = Input.Search;
-class coursesHome extends Component{
+class CoursesHome extends Component{
   constructor(props) {
     super(props)
     this.state = {
@@ -160,7 +160,7 @@ class coursesHome extends Component{
     )
   }
 }
-export default coursesHome;
+export default CoursesHome;
 
 
 //                {/*<Pagination showQuickJumper current={page} pageSize={16} total={coursesHomelist.courses_count} onChange={this.onChange} />*/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js
index 2f65c622f..cd671cbe4 100644
--- a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js
+++ b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js
@@ -4,7 +4,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import {Tooltip,Spin,Alert} from 'antd';
 import ShowSpin from '../../../common/ShowSpin';
 
-class coursesHomeCard extends Component{
+class CoursesHomeCard extends Component{
   constructor(props) {
     super(props)
   }
@@ -134,5 +134,5 @@ class coursesHomeCard extends Component{
           )
         }
       }
-export default coursesHomeCard;
+export default CoursesHomeCard;
 

From 200520c908a8dc353b5dacd859dffb046be83142 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 23 Jul 2019 11:03:23 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 4e4d494ce..064061058 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -161,7 +161,7 @@ class SubjectsController < ApplicationController
     end
 
     @shixuns = @shixuns.reorder("created_at desc")
-    @shixuns_count = @shixuns.count
+    @shixuns_count = @shixuns.size
 
     ## 分页参数
     page  = params[:page] || 1

From 0026dfe6160c9b24b30c9e0c29785bab8fde7261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 23 Jul 2019 11:04:57 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/NewHeader.js              | 1 +
 public/react/src/modules/tpm/TPMBanner.js              | 2 +-
 public/react/src/modules/tpm/newshixuns/Newshixuns.js  | 4 +---
 public/react/src/modules/tpm/shixuns/css/TPMBanner.css | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 5f7f485f8..c1ad97276 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -738,6 +738,7 @@ submittojoinclass=(value)=>{
                           <li className="clearfix mb10">
                             <label className="panel-form-label fl">项目邀请码：</label>
                             <Input type="text" className="input-60-40 fl" name="invite_code"
+																	 style={{width: '275px'}}
                                    placeholder="请输入5位课堂邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
                           </li>
 
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 23b228800..5efadc1d1 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -597,7 +597,7 @@ class TPMBanner extends Component {
                 </ul>
 
                 <div className="pr fl" id="commentsStar">
-									  <div className={"color-grey-c"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
+									  <div className={"color-grey-c mb11"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
                     <div className="rateYo">
                         <Rating value={star_info[0]} disabled allowHalf/>
                     </div>
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 184b6313a..956e652c8 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -236,9 +236,7 @@ class Newshixuns extends Component {
         let newshixunUrl = `/shixuns/new.json`;
         axios.get(newshixunUrl).then((response) => {
             if (response.status === 200) {
-                if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
-
-                } else {
+                if (response.data.message===undefined) {
                     this.setState({
                         newshixunlist: response.data
                     });
diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
index 0492f20c3..b3233f641 100644
--- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -87,7 +87,7 @@ a:active{text-decoration:none;}
 #commentsStar{
     margin-top: -7px;
     width: 90px;
-    margin-bottom: 11px;
+
 }
 .startbtnModal .ant-modal-content{
     background: transparent;