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

# Conflicts:
#	src/pages/exam/examPaper.vue

src/pages/exam/examPaper.vue

@@ -16,7 +16,7 @@
           />
           <van-count-down
             :time="time"
-            :auto-start="true"
+            :auto-start="autoTimeStart"
             class="flex flex_center_center"
             ref="countdown"
             @finish="examFinish"
@@ -356,15 +356,16 @@ export default {
     let Gid = uni.getStorageSync("userInfo").Id;
     let { refs } = getCurrentInstance();
     let data = reactive({
-      time: 1 * 60 * 60 * 1000,
+      time: 999,
       statusBarHeight: 0,
-      // msg: { GuestId: Gid, PaperId: 6, PublishId: 3 },
+      // msg: { GuestId: 64, PaperId: 34, PublishId: 9 },
       msg: { GuestId: Gid, PaperId: 0, PublishId: 0 },
       peaperDetail: {},
       changeIndex: 0, //大题序号
       isLast: false, //用于判断是否从后往前翻
       isShowAnswer: false, //是否显示答题卡
       Exam_Student_Id: 0,
+      autoTimeStart: false,
     });
     let methods = {
       changeNumToHan,
@@ -382,8 +383,11 @@ export default {
       async getPaperDetail() {
         let res = await getPaperDetail(data.msg);
         if (res) {
-          data.peaperDetail = res.Data;
-          data.time = res.Data.Publish.ExamTimes * 60 * 1000;
+          if (res.Code == 1) {
+            data.peaperDetail = res.Data;
+            data.autoTimeStart = true;
+            data.time = res.Data.Publish.ExamTimes * 60 * 1000;
+          }
         }
       },
       //往后翻