From 3f2cdc3ecef7cfa6d724951749fdeab8e3726aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 17 Aug 2019 14:39:27 +0800 Subject: [PATCH 1/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 --- .../modules/courses/Resource/Fileslistitem.js | 69 ++++++++++--------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index d3405ebf5..feae05740 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -27,35 +27,40 @@ class Fileslistitem extends Component{ this.props.Settingtypes(discussMessage.id) } - showfiles=(value)=>{ - let {discussMessage,coursesId}=this.props - let file_id=discussMessage.id - let url="/files/"+file_id+"/histories.json" - axios.get(url,{ - params:{ - course_id:coursesId - }, - }).then((result)=>{ - - if(result.data.attachment_histories.length===0){ - // if(result.data.is_pdf===true){ - // this.props.ShowOnlinePdf(result.data.url) - // //预览pdf - // }else{ - // - // } - this.props.DownloadFileA(result.data.title,result.data.url) - }else{ - this.setState({ - Showoldfiles:true, - allfiles:result.data - }) - } - - - }).catch((error)=>{ - console.log(error) - }) + showfiles=(list)=>{ + if(list.is_history_file===false){ + this.props.DownloadFileA(list.title,list.url) + }else{ + let {discussMessage,coursesId}=this.props + let file_id=discussMessage.id + let url="/files/"+file_id+"/histories.json" + axios.get(url,{ + params:{ + course_id:coursesId + }, + }).then((result)=>{ + + if(result.data.attachment_histories.length===0){ + // if(result.data.is_pdf===true){ + // this.props.ShowOnlinePdf(result.data.url) + // //预览pdf + // }else{ + // + // } + this.props.DownloadFileA(result.data.title,result.data.url) + }else{ + this.setState({ + Showoldfiles:true, + allfiles:result.data + }) + } + + + }).catch((error)=>{ + console.log(error) + }) + } + } closaoldfilesprops=()=>{ @@ -191,13 +196,13 @@ class Fileslistitem extends Component{ { this.props.isAdmin ? this.showfiles(discussMessage.title)} + onClick={()=>this.showfiles(discussMessage)} title={discussMessage.title} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title} : "" } { this.props.isStudent? this.showfiles(discussMessage.title)} + onClick={()=>this.showfiles(discussMessage)} title={discussMessage.title} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title} :"" } @@ -207,7 +212,7 @@ class Fileslistitem extends Component{ discussMessage.is_lock === true ? {discussMessage.title} :this.showfiles(discussMessage.title)} + onClick={()=>this.showfiles(discussMessage)} title={discussMessage.title} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}:"" } From fff396a35fac61eda63fa8f79476d5d704d47dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 17 Aug 2019 14:56:21 +0800 Subject: [PATCH 2/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/courses/Resource/Fileslistitem.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index feae05740..925bcc817 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -29,7 +29,8 @@ class Fileslistitem extends Component{ showfiles=(list)=>{ if(list.is_history_file===false){ - this.props.DownloadFileA(list.title,list.url) + // this.props.DownloadFileA(list.title,list.url) + window.location.href=list.url; }else{ let {discussMessage,coursesId}=this.props let file_id=discussMessage.id @@ -47,7 +48,8 @@ class Fileslistitem extends Component{ // }else{ // // } - this.props.DownloadFileA(result.data.title,result.data.url) + // this.props.DownloadFileA(result.data.title,result.data.url) + window.location.href=list.url; }else{ this.setState({ Showoldfiles:true, From cddd7826864037268b5187da75917795f760aba1 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 17 Aug 2019 15:05:44 +0800 Subject: [PATCH 3/3] video feature: modify --- app/controllers/users/videos_controller.rb | 1 + app/views/users/get_user_info.json.jbuilder | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/users/videos_controller.rb b/app/controllers/users/videos_controller.rb index 0ad3f87d6..f04d4435d 100644 --- a/app/controllers/users/videos_controller.rb +++ b/app/controllers/users/videos_controller.rb @@ -1,5 +1,6 @@ class Users::VideosController < Users::BaseController before_action :private_user_resources!, :check_account, :require_auth_teacher! + skip_before_action :require_auth_teacher!, only: [:index] helper_method :current_video diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 24f7b21b0..6189358ba 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -10,6 +10,7 @@ json.tidding_count 0 json.user_phone_binded @user.phone.present? json.phone @user.phone json.profile_completed @user.profile_completed? +json.professional_certification @user.professional_certification if @course json.course_identity @course_identity json.course_name @course.name