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

src/components/subject/ListenTopic.vue

@@ -165,7 +165,8 @@
                     <template v-if="isOperate">
                       <textarea
                         type="text"
-                        v-model="item2.myAnswer"
+					    v-for="cItem in item2.SubAnwser"
+                        v-model="cItem.Content"
                         class="chooseName chooseName2"
                         placeholder="请填写答案"
                         @input="AnswerChange(item2)"
@@ -173,8 +174,9 @@
                     </template>
                     <template v-else>
                       <view
+					    v-for="cItem in item2.SubAnwser"
                         class="viewAnswerContent"
-                        v-html="item2.myAnswer"
+                        v-html="cItem.Content"
                       ></view>
                     </template>
                   </view>

src/components/subject/answer.vue

@@ -147,7 +147,7 @@ export default {
         let TimeDis = parseInt(d2 - d1) / 1000 / 60;
         if (TimeDis < props.SubmitTimes) {
           uni.showToast({
-            title: `开场不足${props.SubmitTimes}分钟禁止交卷哦~`,
+            title: `开考不足${props.SubmitTimes}分钟禁止交卷哦~`,
             icon: "none",
           });
           return;

src/pages/exam/examPaper.vue

@@ -531,7 +531,7 @@ export default {
         let TimeDis = parseInt(d2 - d1) / 1000 / 60;
         if (TimeDis < data.SubmitTimes) {
           uni.showToast({
-            title: `开场不足${data.SubmitTimes}分钟禁止交卷哦~`,
+            title: `开考不足${data.SubmitTimes}分钟禁止交卷哦~`,
             icon: "none",
           });
           return;