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
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index d3405ebf5..925bcc817 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -27,35 +27,42 @@ 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)
+ window.location.href=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)
+ window.location.href=list.url;
+ }else{
+ this.setState({
+ Showoldfiles:true,
+ allfiles:result.data
+ })
+ }
+
+
+ }).catch((error)=>{
+ console.log(error)
+ })
+ }
+
}
closaoldfilesprops=()=>{
@@ -191,13 +198,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 +214,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}:""
}