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

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
 

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

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -27,35 +27,42 @@ class Fileslistitem extends Component{
         this.props.Settingtypes(discussMessage.id)
     }
 
-    showfiles=(value)=>{
+    showfiles=(list)=>{
-        let {discussMessage,coursesId}=this.props
+    	if(list.is_history_file===false){
-        let file_id=discussMessage.id
+				// this.props.DownloadFileA(list.title,list.url)
-        let url="/files/"+file_id+"/histories.json"
+				window.location.href=list.url;
-        axios.get(url,{
+			}else{
-            params:{
+				let {discussMessage,coursesId}=this.props
-                course_id:coursesId
+				let file_id=discussMessage.id
-            },
+				let url="/files/"+file_id+"/histories.json"
-        }).then((result)=>{
+				axios.get(url,{
-
+					params:{
-						if(result.data.attachment_histories.length===0){
+						course_id:coursesId
-							// if(result.data.is_pdf===true){
+					},
-							// 	this.props.ShowOnlinePdf(result.data.url)
+				}).then((result)=>{
-							// 	//预览pdf
+
-							// }else{
+					if(result.data.attachment_histories.length===0){
-							//
+						// if(result.data.is_pdf===true){
-							// }
+						// 	this.props.ShowOnlinePdf(result.data.url)
-							this.props.DownloadFileA(result.data.title,result.data.url)
+						// 	//预览pdf
-						}else{
+						// }else{
-							this.setState({
+						//
-								Showoldfiles:true,
+						// }
-								allfiles:result.data
+						// this.props.DownloadFileA(result.data.title,result.data.url)
-							})
+						window.location.href=list.url;
-						}
+					}else{
-
+						this.setState({
-
+							Showoldfiles:true,
-        }).catch((error)=>{
+							allfiles:result.data
-            console.log(error)
+						})
-        })
+					}
+
+
+				}).catch((error)=>{
+					console.log(error)
+				})
+			}
+
     }
 
     closaoldfilesprops=()=>{
@@ -191,13 +198,13 @@ class Fileslistitem extends Component{
 											{
 													this.props.isAdmin ? <a
 															// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-															onClick={()=>this.showfiles(discussMessage.title)}
+															onClick={()=>this.showfiles(discussMessage)}
 															title={discussMessage.title}
 															className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> : ""
 											}
                       {
                         this.props.isStudent?  <a
-                          onClick={()=>this.showfiles(discussMessage.title)}
+                          onClick={()=>this.showfiles(discussMessage)}
                           title={discussMessage.title}
                           className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
                       }
@@ -207,7 +214,7 @@ class Fileslistitem extends Component{
 												 discussMessage.is_lock === true ?
                                 <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
                                 :<a
-														 onClick={()=>this.showfiles(discussMessage.title)}
+														 onClick={()=>this.showfiles(discussMessage)}
 														 title={discussMessage.title}
 														 className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:""
 												}