调整

public/react/src/AppConfig.js

@@ -46,7 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-//  debugType="student";
+//debugType="student";
 
 
 

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -404,7 +404,7 @@ class CoursesBanner extends Component {
     exitclass=()=>{
       this.setState({
         modalsType: true,
-        modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
+        modalsTopval: "退出后您将不再是本课堂的成员，作品将全部被删除，",
         modalsBottomval:"确定要退出该课堂吗？",
         metype:6
       })
@@ -620,13 +620,13 @@ class CoursesBanner extends Component {
                   </div>
 
                   <div className="clearfix ">
-                    <div className="fl fl mr40 mb20" >
+                    <div className="fl fl mr40" >
                       <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
                               {coursedata.teacher_users.length===0?'':
                                <span className="color-white" >协作老师：
                                 {coursedata.teacher_users.map((iem,idx)=>{
                                   return(
-                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span> 
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span>
                                   )
                                 })
                                 }
@@ -635,7 +635,7 @@ class CoursesBanner extends Component {
                         </div>
 
                     </div>
-                   
+
 
                     {/*{excellent===false?*/}
                     {/*  :*/}
@@ -765,12 +765,12 @@ background:rgba(204,204,204,0.2) !important;
 														placement="topLeft"
 																		 title={<pre className="antsoancss">
 																			 {coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
-																				 <span >您有{coursedata.teacher_applies_count}条新的加入申请
-																					 <a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
+																				 <span>新收到{coursedata.teacher_applies_count}条加入课堂的申请
+																					 <a className={"daishenp ml5"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
 																			 <span style={{
 																			 	color:"#FFA804"
 																			 }}>
-																			 待审批
+																			 去审批
 																		 </span></a></span>:""}</pre>}>
 																<span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers")}>
 																	<span className={"mr10"}>教师</span>

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -1188,7 +1188,7 @@ class ShixunHomework extends Component{
 								</span>}
 							</span>
               <li className="fr">
-								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
+								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>
                     <WordsBtn style="blue" className={"mr30 font-16"}>
 											<Link className="color4CACFF" to={`/classrooms/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -308,7 +308,7 @@ class OfficialAcademicTranscript extends Component {
 					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 210px;
+				        max-width: 200px;
 						    text-align: left !important;
 					}
 					.TaskForms{