Merge branch 'master' of https://gitlab.ezijing.com/ezijing/x-learn

src/components/exam/questionListItem.vue

@@ -59,7 +59,7 @@
       </template>
       <div class="answer-item" v-if="data.question_analysis">
         <div class="answer-item-label">解析：</div>
-        <div class="answer-item-content">{{ data.question_analysis }}</div>
+        <div class="answer-item-content" v-html="data.question_analysis"></div>
       </div>
     </div>
   </div>
@@ -194,4 +194,11 @@ export default {
   color: #222;
   line-height: 25px;
 }
+.answer-item-label {
+  white-space: nowrap;
+}
+.answer-item-content {
+  flex: 1;
+  overflow: hidden;
+}
 </style>

src/pages/exam/testExam/index.vue

@@ -40,7 +40,7 @@ export default {
       if (item.status === 0 || item.status === 3) {
         this.open(item)
       } else {
-        this.$router.push({ path: '/testExam/exam', query: { exam_id: item.id, is_create: 1 } })
+        this.$router.push({ path: '/testExam/exam', query: { exam_id: item.id, is_create: 0 } })
       }
     },
     open(item) {
@@ -49,13 +49,16 @@ export default {
         message: '您上次未做完试题',
         showCancelButton: true,
         confirmButtonText: '继续答题',
-        cancelButtonText: '重新答题'
+        cancelButtonText: '重新答题',
+        distinguishCancelAndClose: true
       })
         .then(() => {
           this.$router.push({ path: '/testExam/exam', query: { exam_id: item.id, is_create: 0 } })
         })
-        .catch(() => {
+        .catch(action => {
+          if (action === 'cancel') {
             this.$router.push({ path: '/testExam/exam', query: { exam_id: item.id, is_create: 1 } })
+          }
         })
     }
   }