From fe3c7da3ecccf05f7ef3435b5f55d50b4c432c4d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 6 Sep 2019 10:39:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 83c4ded65..b98073d7c 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -110,6 +110,8 @@ module CoursesHelper course.course_groups_count when "announcement" course.informs.count + when "online_learning" + course.subject.stage_shixuns_count end end From 71ba4136232f910e2642bd97a558b510c07ec7d0 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 6 Sep 2019 11:21:47 +0800 Subject: [PATCH 2/5] disableVideoContextMenu = () => { --- public/react/src/App.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 7cd219dba..520855519 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -334,8 +334,17 @@ class App extends Component { }) } } + disableVideoContextMenu = () => { + window.$( "body" ).on( "mousedown", "video", function() { + if(event.which === 3) { + window.$('video').bind('contextmenu',function () { return false; }); + } else { + window.$('video').unbind('contextmenu'); + } + }); + } componentDidMount() { - + this.disableVideoContextMenu(); // force an update if the URL changes history.listen(() => { From 48c5885d0cb0d3e0247f754f5131bbfb67566b68 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 6 Sep 2019 12:14:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=91=E8=AF=BE=E7=9A=84=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E4=BA=BA=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/subject.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/subject.rb b/app/models/subject.rb index 4b7f4dbcd..6ecb5ed18 100644 --- a/app/models/subject.rb +++ b/app/models/subject.rb @@ -46,8 +46,8 @@ class Subject < ApplicationRecord # 挑战过路径的成员数(金课统计去重后的报名人数) def member_count - excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > shixuns.pluck(:myshixuns_count).sum ? - CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length : shixuns.pluck(:myshixuns_count).sum + excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length > shixuns.pluck(:myshixuns_count).sum ? + CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length : shixuns.pluck(:myshixuns_count).sum end def all_score From 92f39da0a1ca051c604ceb1b15cc714275aa7a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 12:15:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=91=E8=AF=BE?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesDetail/CoursesBanner.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 15f57f130..0a82830f6 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -655,7 +655,10 @@ class CoursesBanner extends Component { this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}> 教师 {coursedata.teacher_count} - this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} className={"pointer"}> + this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} + > 学生 {coursedata.student_count} {coursedata.credit===null?"": From af4fa3dc04424afb387781450ca6e473846b84ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 12:29:02 +0800 Subject: [PATCH 5/5] =?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/courses/coursesDetail/CoursesBanner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 0a82830f6..21ac26727 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -656,7 +656,7 @@ class CoursesBanner extends Component { 教师 {coursedata.teacher_count} this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} > 学生 {coursedata.student_count}