From cfbee65598431e28ee51bf771c306603cee67221 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 5 Nov 2019 16:32:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E8=AF=BE=E7=9A=84=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=92=8C=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/students.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/courses/students.json.jbuilder b/app/views/courses/students.json.jbuilder index 5788b44f2..2790a81fc 100644 --- a/app/views/courses/students.json.jbuilder +++ b/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_mail student.user.hidden_mail + json.user_phone @course.excellent ? "" : student.user.hidden_phone + json.user_mail @course.excellent ? "" : student.user.hidden_mail end end json.students_count @students_count From 0e31e55b5c40b24862f4462c0d0813b8913ac686 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, 5 Nov 2019 17:08:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=91=E8=AF=BE?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/ListPageIndex.js | 8 ++++++- .../courses/coursesDetail/CoursesBanner.js | 1 + .../modules/courses/members/studentsList.js | 24 +++++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index a487cddcb..0a0ff0daf 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/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{
{/*头部banner*/} - + this.ispostexcellenttype(excellent)}> {/*下面是指引哦*/} {/*{yslGuideone!==undefined?*/} {/*(*/} diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 97a00068a..503c73a10 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/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() } diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 8a223ce91..646573163 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -697,7 +697,27 @@ 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(
{students && !!students.length && -
+
}
From 759b22700bb62c32d42692aaaa51382a617a73af 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, 5 Nov 2019 17:10:37 +0800 Subject: [PATCH 3/3] =?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/home/shixunsHome.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 4db39a310..8cdee3554 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -147,7 +147,9 @@ class ShixunsHome extends Component { nextArrow={} prevArrow={} autoplay - animation={false} + autoplaySpeed={5000} + animation={false} + pauseOnHover={true} style={{width:"100%"}} arrowPos="outer"> {homedatalist.images_url.map((item, index) => (