Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/helpers/exercises_helper.rb

@@ -714,9 +714,9 @@ module ExercisesHelper
     end
     teacher_review = ex_user.subjective_score < 0.0 ? false : true
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
-      ex_object_score = ex_user.objective_score < 0.0 ? 0.0 : ex_user.objective_score.round(1).to_s
+      ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
-      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : ex_user.subjective_score.round(1).to_s
+      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : (ex_user.subjective_score > 0.0 ? ex_user.subjective_score.round(1).to_s : 0)
-      score = ex_user.score.present? ? ex_user.score.round(1).to_s : 0.0.to_s
+      score = ex_user.score.present? && ex_user.score > 0.0 ? ex_user.score.round(1).to_s : 0.to_s
     else
       ex_object_score = nil
       ex_subject_score = nil

public/react/src/modules/courses/Video/Live.js

@@ -9,6 +9,7 @@ import bilibili from './images/bilibili.png';
 import tencent from './images/tencent.png';
 import WeiBaiTong from './images/WeiBaiTong.png';
 import douyu from './images/douyu.jpg';
+import zoom from './images/zoom.png';
 class Live extends Component{
 
    render(){
@@ -16,31 +17,64 @@ class Live extends Component{
 
       return(
        <div className="livePanel">
+				 <style>
+					 {
+					 	`
+					 	.verticallayout{
+						display: flex;
+						 flex-direction:column;
+						}
+						
+						.myspacearound{
+						display: flex;
+						justify-content: space-around;
+						}
+						.mr0{
+						margin-right: 0px !important;
+						}
+						.mr5{
+						margin-right: 5px !important;
+						}
+						.ml0{
+						margin-left: 0px !important;
+						}
+					 	`
+					 }
+				 </style>
           <p className="mt30 mb10 color-grey-9 pl10">EduCoder支持所有第三方直播平台，特别推荐：</p>
-          <ul className="platform">
+          <ul className="platform myspacearound">
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://ke.qq.com/act/speed_pc/index.html?from=800021837" target="_blank"><img alt="" src={tencent} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">腾讯课堂</label>
               </a>
-              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://live.bilibili.com/liveHime?visit_id=a81rbm7v2kk0" target="_blank"><img alt="" src={bilibili} className="mr8" width="52px"/>
               <label className="color-grey-3 pointer">哔哩哔哩</label>
               </a>
-              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://www.douyu.com/" target="_blank"><img alt="" src={douyu} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">斗鱼</label>
               </a>
-              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
-              <div><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
+              <div>
+								<img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
                 <label className="color-grey-3">威佰通</label>
               </div>
-              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml0">(简明手册)</a>
+            </li>
+						<li className="verticallayout mr0">
+							<a href="https://zoom.com.cn/download" target="_blank"><img alt="" src={zoom} className="mr8" width="63px"/>
+								<label className="color-grey-3" style={{
+									cursor:"pointer"
+								}}>zoom</label>
+							</a>
+							<a href="https://support.zoom.us/hc/zh-cn/articles/201362033-Windows%E5%92%8CMAC%E5%85%A5%E9%97%A8%E6%8C%87%E5%8D%97" target="_blank" className="color-blue ml0">(简明手册)</a>
 						</li>
           </ul>
           {

public/react/src/modules/courses/Video/LiveNew.js

@@ -9,7 +9,7 @@ import axios from 'axios';
 
 const { TextArea } = Input;
 const { Option  } = Select;
-const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通'];
+const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通','zoom'];
 
 function range(start, end) {
   const result = [];

public/react/src/modules/courses/Video/VideoIndex.js

@@ -299,8 +299,7 @@ class VideoIndex extends Component {
 		const flag = parseInt(course_identity) < 5;
 		const newOperation = flag;
 		const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
-
+		let isAdmin = this.props&&this.props.isAdmin();
-
 
 		return (
 			<React.Fragment>
@@ -404,7 +403,10 @@ class VideoIndex extends Component {
 
 											</React.Fragment>
 											:
+											isAdmin===true?
 												<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+												:
+												""
 									}
 								</li>
 							</div>

public/react/src/modules/question/questioncss/questioncom.css

@@ -428,7 +428,7 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer !important;
+    cursor:√ !important;
 }
 .xiaoshout{
     cursor:default !important;