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

public/react/config/webpack.config.dev.js

@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      // {
+      {
-      //   test: /\.(js|jsx|mjs)$/,
+        test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
+        enforce: 'pre',
-      //   use: [
+        use: [
-      //     {
+          {
-      //       options: {
+            options: {
-      //         formatter: eslintFormatter,
+              formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
+              eslintPath: require.resolve('eslint'),
-			//
+
-      //       },
+            },
-      //       loader: require.resolve('eslint-loader'),
+            loader: require.resolve('eslint-loader'),
-      //     },
+          },
-      //   ],
+        ],
-      //   include: paths.appSrc,
+        include: paths.appSrc,
-      // },
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -690,7 +690,7 @@ class ExerciseReviewAndAnswer extends Component{
                           }
                           {
                             //(老师身份且除实训题外) || (学生身份且试卷已经截止)就显示用户当前题目所得分数
-                          ( isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5  ?
+                          ( isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 && item.user_score ?
                             <span className="font-16 ml20">
                               <i className={parseInt(item.answer_status) ==0 ? "iconfont icon-htmal5icon19 color-red font-20 fl":parseInt(item.answer_status) ==1 ? "fl iconfont icon-wancheng font-20 color-green" :"iconfont icon-htmal5icon19 color-orange-tip font-20 fl"}></i>
                               <span><span className={parseInt(item.answer_status) == 0 ?"color-red":parseInt(item.answer_status) == 1 ?"color-green":"color-orange-tip"}>{item.user_score}</span> 分</span>

public/react/src/modules/courses/exercise/question/multiple.js

@@ -46,9 +46,9 @@ class Multiple extends Component{
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               return(
-                <p className="clearfix mb15">
+                <p className="clearfix mb15 df">
                   <Checkbox className="fl lineh-20 " value={item.choice_id}></Checkbox>
-                  <span class="fl lineh-20">{tagArray[key]}.</span><span style={{display:"inline-block"}} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
+                  <span class="fl lineh-20 mt1">{tagArray[key]}.</span><span style={{display:"inline-block"}} className="markdown-body mt1" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
                 </p>
               )
             })

public/react/src/modules/courses/exercise/question/simpleAnswer.js

@@ -54,7 +54,7 @@ class simpleAnswer extends Component{
         <li className="with100">
           {
             user_exercise_status == 1 ? 
-            <div className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.user_answer.length>0 ? questionType.user_answer[0]:"")}}></div>
+            <div className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.user_answer.length>0 ? questionType.user_answer[0]:"")}}></div>
             :
             <div>
               <TPMMDEditor ref={this.mdRef} initValue={questionType.user_answer.length > 0 ? questionType.user_answer[0]:''} mdID={'simpleEditor'+questionType.question_id}  placeholder="请输入你的答案"
@@ -69,9 +69,9 @@ class simpleAnswer extends Component{
             {
               exercise.answer_status == 1 || questionType.a_flag ? 
               <div className="standardAnswer">
-                <p className="mb10">参考答案：</p>
+                <p className="mb10 font-16">参考答案：</p>
-                <li className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.standard_answer && questionType.standard_answer[0])}}></li>
+                <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.standard_answer && questionType.standard_answer[0])}}></li>
-                <p className="mt15"><a className="color-blue" onClick={()=>this.showAndHide(false)}>隐藏参考答案</a></p>
+                <p className="mt15"><a className="color-blue font-16" onClick={()=>this.showAndHide(false)}>隐藏参考答案</a></p>
               </div>
               :
               <a className="color-blue font-16" onClick={()=>this.showAndHide(true)}>显示参考答案</a>
@@ -82,7 +82,7 @@ class simpleAnswer extends Component{
           isStudent && exercise.answer_open==true && exercise.exercise_status == 3 ?
           <div className="bor-top-greyE pt20 mt20 standardAnswer">
             <p>参考答案：</p>
-            <li className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.standard_answer && questionType.standard_answer[0])}}></li>
+            <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML(questionType.standard_answer && questionType.standard_answer[0])}}></li>
           </div>:""
         }
       </div>

public/react/src/modules/courses/exercise/question/single.js

@@ -41,9 +41,9 @@ class single extends Component{
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               return(
-                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15" : "fl mr40"}>
+                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15 df" : "fl mr40"}>
                   <Radio className="fl lineh-20" value={item.choice_id}></Radio>
-                  <span className="fl lineh-20 mr3">{tagArray[key]}.</span><span style={{display:"inline-block"}} className="markdown-body fl" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
+                  <span className="fl lineh-20 mr3 mt1">{tagArray[key]}.</span><span style={{display:"inline-block"}} className="markdown-body fl mt1" dangerouslySetInnerHTML={{__html: markdownToHTML(item.choice_text)}}></span>
                 </p>
               )
             })

public/react/src/modules/courses/poll/pollStyle.css

@@ -323,7 +323,6 @@ textarea:read-only{
 }
 .standardAnswer p{
   line-height: 20px!important;
-  font-size: 16px;
 }
 /* 倒计时 */
 .remainingTime li{