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

app/controllers/wechats/js_sdk_signatures_controller.rb

@@ -1,7 +1,10 @@
 class Wechats::JsSdkSignaturesController < ApplicationController
   def create
-    signature = Util::Wechat.js_sdk_signature(params[:url], params[:noncestr], params[:timestamp])
-    render_ok(signature: signature)
+    timestamp = (Time.now.to_f * 1000).to_i
+    noncestr = ('A'..'z').to_a.sample(8).join
+    signature = Util::Wechat.js_sdk_signature(params[:url], noncestr, timestamp)
+
+    render_ok(appid: Util::Wechat.appid, timestamp: timestamp, noncestr: noncestr, signature: signature)
   rescue Util::Wechat::Error => ex
     render_error(ex.message)
   end

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2499,6 +2499,8 @@ class Listofworksstudentone extends Component {
 		// console.log(data);
 		// console.log(datas);
 		// console.log(this.props.isAdmin());
+
+	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
 		return (
 			this.props.isAdmin() === true ?
 				(
@@ -2639,7 +2641,7 @@ class Listofworksstudentone extends Component {
 							<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 								<li className="clearfix ">
 									<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-									<span>
+									{course_is_end===true?<span>
 									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
 										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
 											计算成绩
@@ -2649,7 +2651,7 @@ class Listofworksstudentone extends Component {
 												计算成绩
 											</div>:"")
 									}
-						  	</span>
+						  	 </span>:""}
 
 									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 										<Search
@@ -2944,7 +2946,7 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?
 															<div className={"computeTime font-13"} onClick={this.setComputeTime}>
@@ -3154,7 +3156,7 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+															{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 															计算成绩