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

public/react/src/modules/courses/members/CourseGroupChooser.js

@@ -89,7 +89,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde
             <p className="drop_down_btn">
                 <a href="javascript:void(0)" className="color-grey-6"
                     onClick={() => trigger('groupAdd')}
-                >添加分班</a>
+                >新建分班</a>
             </p>
         </ul>
     )

public/react/src/modules/courses/members/CourseGroupList.js

@@ -210,13 +210,13 @@ function CourseGroupList(props) {
                 onPressEnter={onPressEnter}
             ></Titlesearchsection>
             
-            <div className="mt20 edu-back-white padding20-30 ">
+            {!!none_group_member_count && <div className="mt20 edu-back-white padding20-30 ">
                 <span>未分班：</span>
                 <span style={{color: '#999999'}}>{none_group_member_count}个学生</span>
 
                 <WordsBtn style="blue" className="fr " 
                         onClick={() => {props.history.push(`/courses/${courseId}/course_groups/0`)}}>查看</WordsBtn>
-            </div>
+            </div>}
 
             <Spin size="large" spinning={isSpin}>
                 {course_groups && !!course_groups.length ? 

public/react/src/modules/courses/members/studentsList.js

@@ -107,7 +107,7 @@ const buildColumns = (that,isParent) => {
   }
   ];
   if (course_groups && course_groups.length) {
-    columns.push({
+    this.isStudentPage && columns.push({
       title: '分班',
       dataIndex: 'course_group_name',
       key: 'course_group_name',
@@ -589,15 +589,15 @@ class studentsList extends Component{
           <div>是否确认删除?</div>
         </div>,
       onOk: () => {
-        // const cid = this.props.match.params.coursesId
         const course_group_id = this.props.match.params.course_group_id
+        const courseId = this.props.match.params.coursesId    
 
         const url = `/course_groups/${course_group_id}.json`
         axios.delete(url)
         .then((response) => {
           if (response.data.status == 0) {
             this.props.showNotification('删除成功')
-            this.props.history.push(response.data.right_url)
+            this.props.history.push(`/courses/${coursesId}/course_groups`)
           }
         })
         .catch(function (error) {
@@ -687,6 +687,7 @@ class studentsList extends Component{
     } else {
       pageType = TYPE_COURSE_GOURP_PARENT
     }
+    // 本页面有2个状态，学生列表、具体分班
     const isStudentPage = pageType == TYPE_STUDENTS
     this.isStudentPage = isStudentPage
     const isGroupChildPage = pageType == TYPE_COURSE_GOURP_CHILD
@@ -804,7 +805,7 @@ class studentsList extends Component{
         {
           total_count > 0 || this.state.isSpin == true ?
           <div className="mt20 edu-back-white padding20">
-            <div className="clearfix stu_head" style={{paddingLeft: '15px'}}>
+            <div className="clearfix stu_head" style={{paddingLeft: '5px'}}>
               {isAdmin && !isStudentPage && <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue} >已选 {checkBoxValues.length} 个</Checkbox>}
               <div className="studentList_operation_ul">
                 {/* {isAdmin && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>} */}
@@ -835,7 +836,7 @@ class studentsList extends Component{
                       <p className="drop_down_btn">
                         <a href="javascript:void(0)" className="color-grey-6"
                             onClick={()=>this.addDir()}
-                        >添加分班...</a>
+                        >新建分班...</a>
                       </p>
 
                     }