Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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 = []

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}>

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;