diff --git a/p__Classrooms__Lists__Exercise__Answer__index.async.js b/p__Classrooms__Lists__Exercise__Answer__index.async.js
index ccd40d7fce..7f82bd5cce 100644
--- a/p__Classrooms__Lists__Exercise__Answer__index.async.js
+++ b/p__Classrooms__Lists__Exercise__Answer__index.async.js
@@ -8687,7 +8687,7 @@ var Answer_scoreStatusMapping = {
   1: 'c-green'
 };
 var Answer = function Answer(_ref) {
-  var _user$userInfo, _user$userInfo2, _user$userInfo3, _answerData$exercise4, _answerData$exercise28, _answerData$exercise29, _answerData$exercise30, _answerData$exercise31, _answerData$exercise32, _answerData$exercise33, _answerData$exercise34, _answerData$exercise35, _answerData$exercise36, _answerData$exercise37, _answerData$exercise_17, _answerData$exercise38, _answerData$exercise39, _answerData$exercise40, _answerData$exercise41, _answerData$exercise42, _answerData$exercise43, _answerData$question_8, _answerData$exercise_18, _answerData$question_9, _answerData$exercise_19, _answerData$exercise_20, _answerData$exercise_21, _answerData$exercise_22, _answerData$exercise_23, _answerData$exercise44, _answerData$exercise_24, _answerData$exercise45, _answerData$exercise46, _answerData$exercise_25, _answerData$exercise_27, _answerData$exercise_28, _answerData$exercise_29, _answerData$exercise47, _answerData$exercise48, _answerData$exercise49, _answerData$exercise50, _answerData$exercise_30;
+  var _user$userInfo, _user$userInfo2, _user$userInfo3, _answerData$exercise4, _answerData$exercise28, _answerData$exercise29, _answerData$exercise30, _answerData$exercise31, _answerData$exercise32, _answerData$exercise33, _answerData$exercise34, _answerData$exercise35, _answerData$exercise36, _answerData$exercise37, _answerData$exercise_18, _answerData$exercise38, _answerData$exercise39, _answerData$exercise40, _answerData$exercise41, _answerData$exercise42, _answerData$exercise43, _answerData$question_8, _answerData$exercise_19, _answerData$question_9, _answerData$exercise_20, _answerData$exercise_21, _answerData$exercise_22, _answerData$exercise_23, _answerData$exercise_24, _answerData$exercise44, _answerData$exercise_25, _answerData$exercise45, _answerData$exercise46, _answerData$exercise_26, _answerData$exercise_28, _answerData$exercise_29, _answerData$exercise_30, _answerData$exercise47, _answerData$exercise48, _answerData$exercise49, _answerData$exercise50, _answerData$exercise_31;
   var globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     user = _ref.user,
@@ -11024,16 +11024,6 @@ var Answer = function Answer(_ref) {
                     //点击的答题卡选项恰好是当前题目时不该做任何操作
                     return;
                   }
-                  setQuestionItem(item);
-                  if (index !== oneindex || k !== twoindex) {
-                    // 切换不同题触发
-                    if (!isSubmitCode) {
-                      setTimeout(function () {
-                        getSaveHackEvaluate(item);
-                      }, 500);
-                    }
-                    setIsSubmitCode(false);
-                  }
                   if (sign.current) {
                     sign.current = 'appoint';
                     skipData.current = {
@@ -11273,7 +11263,7 @@ var Answer = function Answer(_ref) {
     settwoindex(twoindex);
   };
   var skipAppointQuestion = function skipAppointQuestion(p) {
-    var _answerData$exercise_10, _answerData$exercise26, _currentQuestionItem$6;
+    var _answerData$exercise_10, _answerData$exercise26, _currentQuestionItem$6, _answerData$exercise_11;
     var record = p || skipData.current;
     var currentQuestionItem = (_answerData$exercise_10 = answerData.exercise_question_types) === null || _answerData$exercise_10 === void 0 || (_answerData$exercise_10 = _answerData$exercise_10[oneindex]) === null || _answerData$exercise_10 === void 0 || (_answerData$exercise_10 = _answerData$exercise_10.items) === null || _answerData$exercise_10 === void 0 ? void 0 : _answerData$exercise_10[twoindex];
     if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise26 = answerData.exercise) === null || _answerData$exercise26 === void 0 ? void 0 : _answerData$exercise26.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
@@ -11291,6 +11281,13 @@ var Answer = function Answer(_ref) {
       //如果勾选了不再提示，则手动设为已答
       currentQuestionItem.ques_status = 1;
     }
+    if ((currentQuestionItem === null || currentQuestionItem === void 0 ? void 0 : currentQuestionItem.question_type) == 8 && !isSubmitCode) {
+      setTimeout(function () {
+        getSaveHackEvaluate(currentQuestionItem);
+      }, 500);
+    }
+    setQuestionItem(answerData === null || answerData === void 0 || (_answerData$exercise_11 = answerData.exercise_question_types) === null || _answerData$exercise_11 === void 0 || (_answerData$exercise_11 = _answerData$exercise_11[record === null || record === void 0 ? void 0 : record.oneindex]) === null || _answerData$exercise_11 === void 0 || (_answerData$exercise_11 = _answerData$exercise_11.items) === null || _answerData$exercise_11 === void 0 ? void 0 : _answerData$exercise_11[record === null || record === void 0 ? void 0 : record.twoindex]);
+    setIsSubmitCode(false);
     setoneindex(record === null || record === void 0 ? void 0 : record.oneindex);
     settwoindex(record === null || record === void 0 ? void 0 : record.twoindex);
     questionPartRef.current.scrollTo({
@@ -11365,17 +11362,17 @@ var Answer = function Answer(_ref) {
     skipData.current = {};
   };
   var renderClassifyQuestion = function renderClassifyQuestion() {
-    var _answerData$exercise_11, _answerData$exercise_12, _answerData$exercise_13, _answerData$exercise_14, _answerData$exercise_15, _answerData$exercise_16;
-    var currentItem = answerData === null || answerData === void 0 || (_answerData$exercise_11 = answerData.exercise_question_types) === null || _answerData$exercise_11 === void 0 || (_answerData$exercise_11 = _answerData$exercise_11[oneindex].items) === null || _answerData$exercise_11 === void 0 ? void 0 : _answerData$exercise_11[twoindex];
+    var _answerData$exercise_12, _answerData$exercise_13, _answerData$exercise_14, _answerData$exercise_15, _answerData$exercise_16, _answerData$exercise_17;
+    var currentItem = answerData === null || answerData === void 0 || (_answerData$exercise_12 = answerData.exercise_question_types) === null || _answerData$exercise_12 === void 0 || (_answerData$exercise_12 = _answerData$exercise_12[oneindex].items) === null || _answerData$exercise_12 === void 0 ? void 0 : _answerData$exercise_12[twoindex];
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(_react_17_0_2_react.Fragment, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: "pt20 mb20",
         children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
           className: Answermodules.questionTypeTitle,
-          children: [(0,util/* toChineseNumber */.EM)(oneindex + 1), "\u3001", answerData === null || answerData === void 0 || (_answerData$exercise_12 = answerData.exercise_question_types) === null || _answerData$exercise_12 === void 0 || (_answerData$exercise_12 = _answerData$exercise_12[oneindex]) === null || _answerData$exercise_12 === void 0 ? void 0 : _answerData$exercise_12.name]
+          children: [(0,util/* toChineseNumber */.EM)(oneindex + 1), "\u3001", answerData === null || answerData === void 0 || (_answerData$exercise_13 = answerData.exercise_question_types) === null || _answerData$exercise_13 === void 0 || (_answerData$exercise_13 = _answerData$exercise_13[oneindex]) === null || _answerData$exercise_13 === void 0 ? void 0 : _answerData$exercise_13.name]
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
           className: Answermodules.questionTypeInfo,
-          children: ["\uFF08\u5171", answerData === null || answerData === void 0 || (_answerData$exercise_13 = answerData.exercise_question_types) === null || _answerData$exercise_13 === void 0 || (_answerData$exercise_13 = _answerData$exercise_13[oneindex]) === null || _answerData$exercise_13 === void 0 ? void 0 : _answerData$exercise_13.count, "\u9898\uFF1B", (answerData === null || answerData === void 0 || (_answerData$exercise_14 = answerData.exercise_question_types) === null || _answerData$exercise_14 === void 0 || (_answerData$exercise_14 = _answerData$exercise_14[oneindex]) === null || _answerData$exercise_14 === void 0 ? void 0 : _answerData$exercise_14.question_type) === 7 ? "\u5305\u542B".concat(answerData === null || answerData === void 0 || (_answerData$exercise_15 = answerData.exercise_question_types) === null || _answerData$exercise_15 === void 0 || (_answerData$exercise_15 = _answerData$exercise_15[oneindex]) === null || _answerData$exercise_15 === void 0 ? void 0 : _answerData$exercise_15.sub_questions_count, "\u5C0F\u9898") : '', " \u5171", answerData === null || answerData === void 0 || (_answerData$exercise_16 = answerData.exercise_question_types) === null || _answerData$exercise_16 === void 0 || (_answerData$exercise_16 = _answerData$exercise_16[oneindex]) === null || _answerData$exercise_16 === void 0 ? void 0 : _answerData$exercise_16.score, "\u5206\uFF09"]
+          children: ["\uFF08\u5171", answerData === null || answerData === void 0 || (_answerData$exercise_14 = answerData.exercise_question_types) === null || _answerData$exercise_14 === void 0 || (_answerData$exercise_14 = _answerData$exercise_14[oneindex]) === null || _answerData$exercise_14 === void 0 ? void 0 : _answerData$exercise_14.count, "\u9898\uFF1B", (answerData === null || answerData === void 0 || (_answerData$exercise_15 = answerData.exercise_question_types) === null || _answerData$exercise_15 === void 0 || (_answerData$exercise_15 = _answerData$exercise_15[oneindex]) === null || _answerData$exercise_15 === void 0 ? void 0 : _answerData$exercise_15.question_type) === 7 ? "\u5305\u542B".concat(answerData === null || answerData === void 0 || (_answerData$exercise_16 = answerData.exercise_question_types) === null || _answerData$exercise_16 === void 0 || (_answerData$exercise_16 = _answerData$exercise_16[oneindex]) === null || _answerData$exercise_16 === void 0 ? void 0 : _answerData$exercise_16.sub_questions_count, "\u5C0F\u9898") : '', " \u5171", answerData === null || answerData === void 0 || (_answerData$exercise_17 = answerData.exercise_question_types) === null || _answerData$exercise_17 === void 0 || (_answerData$exercise_17 = _answerData$exercise_17[oneindex]) === null || _answerData$exercise_17 === void 0 ? void 0 : _answerData$exercise_17.score, "\u5206\uFF09"]
         }), !(currentItem !== null && currentItem !== void 0 && currentItem.repeat_answer) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
           style: {
             color: '#E30000',
@@ -11489,7 +11486,7 @@ var Answer = function Answer(_ref) {
             children: "\u4EA4\u5377"
           })
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: ((answerData === null || answerData === void 0 || (_answerData$exercise36 = answerData.exercise) === null || _answerData$exercise36 === void 0 ? void 0 : _answerData$exercise36.commit_status) == 1 || (answerData === null || answerData === void 0 || (_answerData$exercise37 = answerData.exercise) === null || _answerData$exercise37 === void 0 ? void 0 : _answerData$exercise37.exercise_status) == 3) && (answerData === null || answerData === void 0 || (_answerData$exercise_17 = answerData.exercise_answer_user) === null || _answerData$exercise_17 === void 0 ? void 0 : _answerData$exercise_17.analysis) && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+          children: ((answerData === null || answerData === void 0 || (_answerData$exercise36 = answerData.exercise) === null || _answerData$exercise36 === void 0 ? void 0 : _answerData$exercise36.commit_status) == 1 || (answerData === null || answerData === void 0 || (_answerData$exercise37 = answerData.exercise) === null || _answerData$exercise37 === void 0 ? void 0 : _answerData$exercise37.exercise_status) == 3) && (answerData === null || answerData === void 0 || (_answerData$exercise_18 = answerData.exercise_answer_user) === null || _answerData$exercise_18 === void 0 ? void 0 : _answerData$exercise_18.analysis) && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             className: Answermodules.teachAnalysis,
             onClick: function onClick() {
               return setTeachAnalysisModal(true);
@@ -11595,7 +11592,7 @@ var Answer = function Answer(_ref) {
                         style: {
                           color: '#999999'
                         },
-                        children: ["/", answerData === null || answerData === void 0 || (_answerData$exercise_18 = answerData.exercise_types) === null || _answerData$exercise_18 === void 0 ? void 0 : _answerData$exercise_18.q_counts]
+                        children: ["/", answerData === null || answerData === void 0 || (_answerData$exercise_19 = answerData.exercise_types) === null || _answerData$exercise_19 === void 0 ? void 0 : _answerData$exercise_19.q_counts]
                       })]
                     })]
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
@@ -11604,7 +11601,7 @@ var Answer = function Answer(_ref) {
                       trailColor: "#0000000d",
                       percent: (answerData === null || answerData === void 0 || (_answerData$question_9 = answerData.question_status) === null || _answerData$question_9 === void 0 || (_answerData$question_9 = _answerData$question_9.filter(function (val) {
                         return val.ques_status === 1;
-                      })) === null || _answerData$question_9 === void 0 ? void 0 : _answerData$question_9.length) / (answerData === null || answerData === void 0 || (_answerData$exercise_19 = answerData.exercise_types) === null || _answerData$exercise_19 === void 0 ? void 0 : _answerData$exercise_19.q_counts) * 100,
+                      })) === null || _answerData$question_9 === void 0 ? void 0 : _answerData$question_9.length) / (answerData === null || answerData === void 0 || (_answerData$exercise_20 = answerData.exercise_types) === null || _answerData$exercise_20 === void 0 ? void 0 : _answerData$exercise_20.q_counts) * 100,
                       showInfo: false
                     })
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
@@ -11615,7 +11612,7 @@ var Answer = function Answer(_ref) {
                           style: {
                             color: '#165DFF'
                           },
-                          children: (answerData === null || answerData === void 0 || (_answerData$exercise_20 = answerData.exercise_types) === null || _answerData$exercise_20 === void 0 ? void 0 : _answerData$exercise_20.q_counts) || (answerData === null || answerData === void 0 || (_answerData$exercise_21 = answerData.exercise_scores) === null || _answerData$exercise_21 === void 0 || (_answerData$exercise_21 = _answerData$exercise_21.exercise_types) === null || _answerData$exercise_21 === void 0 ? void 0 : _answerData$exercise_21.q_counts)
+                          children: (answerData === null || answerData === void 0 || (_answerData$exercise_21 = answerData.exercise_types) === null || _answerData$exercise_21 === void 0 ? void 0 : _answerData$exercise_21.q_counts) || (answerData === null || answerData === void 0 || (_answerData$exercise_22 = answerData.exercise_scores) === null || _answerData$exercise_22 === void 0 || (_answerData$exercise_22 = _answerData$exercise_22.exercise_types) === null || _answerData$exercise_22 === void 0 ? void 0 : _answerData$exercise_22.q_counts)
                         }), " \u9898\uFF1A"]
                       }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                         className: "c-grey-333",
@@ -11623,7 +11620,7 @@ var Answer = function Answer(_ref) {
                           style: {
                             color: '#FA6400'
                           },
-                          children: (answerData === null || answerData === void 0 || (_answerData$exercise_22 = answerData.exercise_types) === null || _answerData$exercise_22 === void 0 ? void 0 : _answerData$exercise_22.q_scores) || (answerData === null || answerData === void 0 || (_answerData$exercise_23 = answerData.exercise_scores) === null || _answerData$exercise_23 === void 0 || (_answerData$exercise_23 = _answerData$exercise_23.exercise_types) === null || _answerData$exercise_23 === void 0 ? void 0 : _answerData$exercise_23.q_scores)
+                          children: (answerData === null || answerData === void 0 || (_answerData$exercise_23 = answerData.exercise_types) === null || _answerData$exercise_23 === void 0 ? void 0 : _answerData$exercise_23.q_scores) || (answerData === null || answerData === void 0 || (_answerData$exercise_24 = answerData.exercise_scores) === null || _answerData$exercise_24 === void 0 || (_answerData$exercise_24 = _answerData$exercise_24.exercise_types) === null || _answerData$exercise_24 === void 0 ? void 0 : _answerData$exercise_24.q_scores)
                         }), " \u5206"]
                       })]
                     })
@@ -11644,7 +11641,7 @@ var Answer = function Answer(_ref) {
                     flex: "1",
                     children: /*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
                       className: "".concat(Answermodules.cardList, " ").concat((_answerData$exercise44 = answerData.exercise) !== null && _answerData$exercise44 !== void 0 && _answerData$exercise44.open_phone_video_recording ? Answermodules.withQrcode : ''),
-                      children: answerData === null || answerData === void 0 || (_answerData$exercise_24 = answerData.exercise_question_types) === null || _answerData$exercise_24 === void 0 ? void 0 : _answerData$exercise_24.map(function (er, index) {
+                      children: answerData === null || answerData === void 0 || (_answerData$exercise_25 = answerData.exercise_question_types) === null || _answerData$exercise_25 === void 0 ? void 0 : _answerData$exercise_25.map(function (er, index) {
                         return /*#__PURE__*/(0,jsx_runtime.jsx)(_react_17_0_2_react.Fragment, {
                           children: renderCardList(er, index)
                         }, er.question_type);
@@ -11771,7 +11768,7 @@ var Answer = function Answer(_ref) {
               children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, {
                   icon: /*#__PURE__*/(0,jsx_runtime.jsx)("i", {
-                    className: "iconfont ".concat((_answerData$exercise_25 = answerData.exercise_question_types) !== null && _answerData$exercise_25 !== void 0 && (_answerData$exercise_25 = _answerData$exercise_25[oneindex].items[twoindex]) !== null && _answerData$exercise_25 !== void 0 && _answerData$exercise_25.is_marked ? 'icon-biaoji1' : 'icon-biaojigaiti'),
+                    className: "iconfont ".concat((_answerData$exercise_26 = answerData.exercise_question_types) !== null && _answerData$exercise_26 !== void 0 && (_answerData$exercise_26 = _answerData$exercise_26[oneindex].items[twoindex]) !== null && _answerData$exercise_26 !== void 0 && _answerData$exercise_26.is_marked ? 'icon-biaoji1' : 'icon-biaojigaiti'),
                     style: {
                       color: '#FFB538',
                       marginRight: 6
@@ -11779,14 +11776,14 @@ var Answer = function Answer(_ref) {
                   }),
                   className: Answermodules.markBtn,
                   onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee32() {
-                    var _answerData$exercise_26;
+                    var _answerData$exercise_27;
                     var res;
                     return regeneratorRuntime_default()().wrap(function _callee32$(_context32) {
                       while (1) switch (_context32.prev = _context32.next) {
                         case 0:
                           _context32.next = 2;
                           return (0,service_exercise/* markQuestion */.sS)(params.categoryId, {
-                            exercise_question_id: (_answerData$exercise_26 = answerData.exercise_question_types[oneindex].items[twoindex]) === null || _answerData$exercise_26 === void 0 ? void 0 : _answerData$exercise_26.question_id
+                            exercise_question_id: (_answerData$exercise_27 = answerData.exercise_question_types[oneindex].items[twoindex]) === null || _answerData$exercise_27 === void 0 ? void 0 : _answerData$exercise_27.question_id
                           });
                         case 2:
                           res = _context32.sent;
@@ -11799,7 +11796,7 @@ var Answer = function Answer(_ref) {
                       }
                     }, _callee32);
                   })),
-                  children: (_answerData$exercise_27 = answerData.exercise_question_types) !== null && _answerData$exercise_27 !== void 0 && (_answerData$exercise_27 = _answerData$exercise_27[oneindex].items[twoindex]) !== null && _answerData$exercise_27 !== void 0 && _answerData$exercise_27.is_marked ? '取消标记' : '标记该题'
+                  children: (_answerData$exercise_28 = answerData.exercise_question_types) !== null && _answerData$exercise_28 !== void 0 && (_answerData$exercise_28 = _answerData$exercise_28[oneindex].items[twoindex]) !== null && _answerData$exercise_28 !== void 0 && _answerData$exercise_28.is_marked ? '取消标记' : '标记该题'
                 })
               }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
                 children: [(oneindex != 0 || twoindex != 0) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
@@ -11813,7 +11810,7 @@ var Answer = function Answer(_ref) {
                     skipPrevQuestion();
                   },
                   children: "\u4E0A\u4E00\u9898"
-                }), !(oneindex === (answerData === null || answerData === void 0 || (_answerData$exercise_28 = answerData.exercise_question_types) === null || _answerData$exercise_28 === void 0 ? void 0 : _answerData$exercise_28.length) - 1 && twoindex === (answerData === null || answerData === void 0 || (_answerData$exercise_29 = answerData.exercise_question_types) === null || _answerData$exercise_29 === void 0 || (_answerData$exercise_29 = _answerData$exercise_29[oneindex]) === null || _answerData$exercise_29 === void 0 || (_answerData$exercise_29 = _answerData$exercise_29.items) === null || _answerData$exercise_29 === void 0 ? void 0 : _answerData$exercise_29.length) - 1) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+                }), !(oneindex === (answerData === null || answerData === void 0 || (_answerData$exercise_29 = answerData.exercise_question_types) === null || _answerData$exercise_29 === void 0 ? void 0 : _answerData$exercise_29.length) - 1 && twoindex === (answerData === null || answerData === void 0 || (_answerData$exercise_30 = answerData.exercise_question_types) === null || _answerData$exercise_30 === void 0 || (_answerData$exercise_30 = _answerData$exercise_30[oneindex]) === null || _answerData$exercise_30 === void 0 || (_answerData$exercise_30 = _answerData$exercise_30.items) === null || _answerData$exercise_30 === void 0 ? void 0 : _answerData$exercise_30.length) - 1) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
                   className: Answermodules.changeButton,
                   type: "primary",
                   onClick: function onClick() {
@@ -12010,7 +12007,7 @@ var Answer = function Answer(_ref) {
       onCancel: function onCancel() {
         return setTeachAnalysisModal(false);
       },
-      children: answerData === null || answerData === void 0 || (_answerData$exercise_30 = answerData.exercise_answer_user) === null || _answerData$exercise_30 === void 0 ? void 0 : _answerData$exercise_30.analysis
+      children: answerData === null || answerData === void 0 || (_answerData$exercise_31 = answerData.exercise_answer_user) === null || _answerData$exercise_31 === void 0 ? void 0 : _answerData$exercise_31.analysis
     })]
   });
 };