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

src/components/exam/examCard.vue

@@ -74,11 +74,12 @@ export default {
   computed: {
     // 当前页面的大题数据
     currentExam() {
-      return this.questionList[this.index]
+      return this.questionList[this.index] || {}
     },
     // 当前题第一个小题
     currentItem() {
-      return this.currentExam.question_list[0]
+      const [first = {}] = this.currentExam.question_list || []
+      return first
     }
   },
   watch: {
@@ -174,6 +175,7 @@ export default {
       if (!questions) return []
       this.questionList = questions.question_items.reduce((result, question) => {
         question.question_list.forEach(list => {
+          console.log(list)
           list = list.map(item => {
             let userAnswers = []
             let sign = false

src/components/exam/questionList.vue

@@ -32,7 +32,7 @@ export default {
     },
     // 公共题干
     conmonTitle() {
-      const [first = {}] = this.data.question_list
+      const [first = {}] = this.data.question_list || []
       return first.common_content
     }
   }