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

app/views/courses/students.json.jbuilder

@@ -10,8 +10,8 @@ json.students do
     if @user_course_identity < Course::ASSISTANT_PROFESSOR && !params[:course_group_id].present?
       json.member_roles student.user.course_role(@course)
     end
-    json.user_phone student.user.hidden_phone
+    json.user_phone @course.excellent ? "" : student.user.hidden_phone
-    json.user_mail student.user.hidden_mail
+    json.user_mail @course.excellent ? "" : student.user.hidden_mail
   end
 end
 json.students_count @students_count

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

@@ -91,6 +91,7 @@ class ListPageIndex extends Component{
     this.state={
       yslGuideone:undefined,
       yslElearning:false,
+			isexcellent:false
     }
   }
   comyslElearning(bool){
@@ -163,6 +164,11 @@ class ListPageIndex extends Component{
       });
     }
    }
+	ispostexcellenttype=(excellent)=>{
+  	this.setState({
+			isexcellent:excellent
+		})
+	}
   render() {
     let {yslGuideone} =this.state;
     // console.log("98");
@@ -175,7 +181,7 @@ class ListPageIndex extends Component{
       <div>
           <div className="newMain clearfix">
               {/*头部banner*/}
-              <CoursesBanner {...this.props}></CoursesBanner>
+              <CoursesBanner {...this.props} ispostexcellenttype={(excellent)=>this.ispostexcellenttype(excellent)}></CoursesBanner>
             {/*下面是指引哦*/}
             {/*{yslGuideone!==undefined?*/}
             {/*(*/}

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

@@ -136,6 +136,7 @@ class CoursesBanner extends Component {
               coursedata: data,
               excellent:data.excellent,
             })
+					this.props.ispostexcellenttype(data.excellent)
 				}else{
 					this.onloadupdatabanner()
 				}

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

@@ -697,6 +697,26 @@ class studentsList extends Component{
     const isStudentPage = pageType == TYPE_STUDENTS
     this.isStudentPage = isStudentPage
     const isGroupChildPage = pageType == TYPE_COURSE_GOURP_CHILD
+		let studentlist=buildColumns(this,isParent);
+    if(this.props.isexcellent===true){
+			studentlist.some((item,key)=> {
+					if (item.title === "手机号") {
+						studentlist.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(this.props.isexcellent===true){
+			studentlist.some((item,key)=> {
+					if (item.title === "邮箱") {
+						studentlist.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
  
     return(
       <React.Fragment >
@@ -866,7 +886,7 @@ class studentsList extends Component{
             <Spin size="large" spinning={this.state.isSpin}>
             <div className="clearfix stu_table">
               {students && !!students.length && <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>       
-                <Table columns={buildColumns(this,isParent)} dataSource={students} onChange={this.onTableChange} pagination={false}></Table>
+                <Table columns={studentlist} dataSource={students} onChange={this.onTableChange} pagination={false}></Table>
               </Checkbox.Group> }
             </div>
             </Spin>

public/react/src/modules/home/shixunsHome.js

@@ -147,7 +147,7 @@ class ShixunsHome extends Component {
                                         nextArrow={<CustomNextArrow />}
                                         prevArrow={<CustomPrevArrow />}
                                         autoplay
-																				autoplaySpeed={4500}
+																				autoplaySpeed={5000}
 																				animation={false}
 																				pauseOnHover={true}
                                         style={{width:"100%"}}