Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master

src/components/subject/ListenTopic.vue

@@ -125,20 +125,17 @@
                       }}</text>，
 											<text>
 												您的答案：
-												<template v-if="item1.AnswerList && item1.AnswerList.length > 0">
-													<text v-if="
-                              item1.QuestionAnswerList[index2].SubAnswer ==
-                              item1.AnswerList[index2].SubAnswer
-                            " class="isTrueAnswer">
+												<template v-if="item1.AnswerList[index2].SubAnswer!=''">
+													<text v-if="item1.QuestionAnswerList[index2].SubAnswer == item1.AnswerList[index2].SubAnswer"class="isTrueAnswer">
 														{{ item1.AnswerList[index2].SubAnswer }}，回答正确
 													</text>
 													<text v-else class="isNotAnswer">
-														<template v-if="item1.AnswerList[index2].SubAnswer != ''">
-															{{ item1.AnswerList[index2].SubAnswer }}，回答错误
-														</template>
-														<template v-else> 未回答 </template>
+														{{ item1.AnswerList[index2].SubAnswer }}，回答错误
 													</text>
 												</template>
+												<template v-else>
+													<text class="isNotAnswer">未回答</text>
+												</template>
 											</text>
 										</view>
 										<view style="margin-top: 20rpx"

src/components/subject/readingCompre.vue

@@ -123,14 +123,16 @@
 												<text
 													class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
 												<text>您的答案：
-													<template v-if="item1.AnswerList && item1.AnswerList.length>0">
+													<template v-if="item1.AnswerList[index2].SubAnswer!=''">
 														<text
 															v-if="item1.QuestionAnswerList[index2].SubAnswer == item1.AnswerList[index2].SubAnswer"
 															class="isTrueAnswer">
 															{{ item1.AnswerList[index2].SubAnswer }}
 														</text>
-														<text v-if="item1.AnswerList[index2].SubAnswer!=''" class="isNotAnswer">{{item1.AnswerList[index2].SubAnswer}}，回答错误</text>
-														<text v-if="item1.AnswerList[index2].SubAnswer==''" class="isNotAnswer">未作答</text>
+														<text v-else class="isNotAnswer">{{item1.AnswerList[index2].SubAnswer}}，回答错误</text>
+													</template>
+													<template v-else>
+														<text class="isNotAnswer">未作答</text>
 													</template>
 												</text>
 											</view>

src/pages/exam/examScore.vue

@@ -66,7 +66,7 @@
       </view>
       <view class="exam_Pingyu">
         <view class="teacher_Say">老师评语</view>
-        <view class="teacher_Inner">
+        <view class="teacher_Inner" v-if="dataList.StuComment">
           {{ dataList.StuComment }}
         </view>
       </view>