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

app/views/exercise_questions/_exercise_questions.json.jbuilder

@@ -21,7 +21,7 @@ if question.question_type <= 2  #当为选择题或判断题时，只显示选
       user_answer_b = user_answer.include?(a.id)
       json.c_position (index+1) if ex_choice_random_boolean  #当选项随机时，选项位置以此为准，否则不出现
       json.choice_id a.id
-      json.choice_text (edit_type.present? ? a.choice_text : "#{(index+65).chr}.#{a.choice_text}")
+      json.choice_text (edit_type.present? || question.question_type == 2) ? a.choice_text : "#{(index+65).chr}.#{a.choice_text}"
       json.choice_position a.choice_position
       if exercise_type == 1 || exercise_type == 4  #1为教师编辑/预览 试卷或问题，2为空白试卷，即标准答案和用户答案都不显示，3为用户开始答题的显示，4为老师评阅试卷或学生在截止后查看试卷
         json.standard_boolean standard_answer_b

app/views/exercise_questions/edit.json.jbuilder

@@ -7,4 +7,4 @@ json.partial! "exercise_questions/exercise_questions",
               exercise_type:1,
               user_answer:[],
               ques_position:nil,
-              edit_type:1
+              edit_type:true

app/views/exercise_questions/show.json.jbuilder

@@ -6,4 +6,5 @@ json.partial! "exercise_questions/exercise_questions",
               shixun_challenges: @exercise_question_shixun,
               exercise_type:1,
               user_answer:[],
-              ques_position:nil
+              ques_position:nil,
+              edit_type:nil

app/views/exercises/_user_exercise_info.json.jbuilder

@@ -62,7 +62,8 @@ json.exercise_questions do
                   exercise_type: ex_type,
                   user_answer: user_ques_answers[:answered_content],
                   shixun_type: user_ques_answers[:shixun_type],
-                  ques_position: nil
+                  ques_position: nil,
+                  edit_type:nil
     if user_ques_comments.count > 0
       json.question_comments do
         json.partial! "exercises/exercise_comments", question_comment:user_ques_answers[:question_comment].first

app/views/exercises/blank_exercise.json.jbuilder

@@ -12,7 +12,8 @@ json.exercise_questions do
                   shixun_challenges: q.exercise_shixun_challenges,
                   exercise_type:2,
                   user_answer:[],
-                  ques_position:nil
+                  ques_position:nil,
+                  edit_type:nil
   end
 end
 

app/views/exercises/edit.json.jbuilder

@@ -16,7 +16,8 @@ json.exercise_questions do
                   exercise_type:1,
                   user_answer:[],
                   shixun_type:0,
-                  ques_position:nil
+                  ques_position:nil,
+                  edit_type:true
   end
 end
 

app/views/exercises/show.json.jbuilder

@@ -19,7 +19,8 @@ json.exercise_questions do
                   exercise_type:1,
                   user_answer:[],
                   shixun_type:0,
-                  ques_position:nil
+                  ques_position:nil,
+                  edit_type:nil
   end
 end
 

app/views/exercises/start_answer.json.jbuilder

@@ -59,6 +59,7 @@ json.exercise_questions do
                   choices:question.exercise_choices,
                   exercise_type:3,
                   shixun_type:question_info[:shixun_type],
-                  ques_position: q[:ques_number]
+                  ques_position: q[:ques_number],
+                  edit_type:nil
   end
 end