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

src/pages/exam/examPaper.vue

@@ -19,6 +19,7 @@
             :auto-start="true"
             class="flex flex_center_center"
             ref="countdown"
+            @finish="examFinish"
           />
         </view>
       </template>
@@ -27,7 +28,7 @@
       <view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index">
         <i
           class="iconfont icon-caidanzu answerSheet"
-          style="position: absolute; right: 15px; top: 85px;z-index:999;"
+          style="position: absolute; right: 15px; top: 85px; z-index: 999"
           @click="showAnswerSheet"
         ></i>
         <!-- 数字单选题 -->
@@ -285,6 +286,7 @@
         :paperData="peaperDetail"
         @hideAnswer="hideAnswerSheet"
         @chooseTopic="jumpTopic"
+        ref="answer"
       />
     </view>
     <van-toast id="van-toast" />
@@ -411,6 +413,11 @@ export default {
           val.index1 + 1;
         data.isShowAnswer = false;
       },
+      //考试结束
+      examFinish() {
+        if (data.peaperDetail.Publish.IsAutoSubmit === 1) {
+        }
+      },
     };
     onMounted(() => {
       getSystemInfo((res) => {

src/pages/exam/examPaperList.vue

@@ -26,13 +26,13 @@
           v-for="(item, index) in examList"
           :key="index"
           class="exam-item"
-          :style="{ 'background-image': `url(${item.bgimg})` }"
-          @click="jumpPage"
+          :style="{ 'background-image': `url(${item.PicList[0]})` }"
+          @click="jumpPage(item.PaperId, item.Id)"
         >
           <view class="testName">
-            {{ item.testName }}
+            {{ item.PaperName }}
           </view>
-          <view class="testTime"> 考试时间:{{ item.testTime }} </view>
+          <view class="testTime"> 考试时间:{{ item.ExamStartTime }} </view>
           <view class="teacherInfo-bg"></view>
           <view class="teacherInfo flex flex_between_center">
             <view class="flex flex_start_center">
@@ -46,7 +46,7 @@
               <view class="teacherName">{{ item.teacherName }}</view>
             </view>
             <view class="exam-status">
-              {{ item.status }}
+              {{ item.ExamStatusStr }}
             </view>
           </view>
         </view>
@@ -99,11 +99,13 @@ export default {
     });
     let methods = {
       changeTab(e) {
-        this.msg.ExamStatus = e.detail.name;
+        data.msg.ExamStatus = e.detail.name;
+        data.msg.pageIndex = 1;
+        methods.getList();
       },
-      jumpPage() {
+      jumpPage(PaperId, Id) {
         uni.navigateTo({
-          url: "/pages/exam/examPaper",
+          url: "/pages/exam/examPaper?PaperId=" + PaperId + "&&Id=" + Id,
         });
       },
       lower(e) {

src/pages/index/index.vue

@@ -62,20 +62,21 @@
             @click="
               jumpPage(`/pages/course/timeTable?classId=${indexData.ClassId}`)
             "
+            v-if="indexData.ClassPlan.TimeStart"
           >
             全部
             <van-icon name="arrow" style="margin-left: 30rpx" />
           </view>
         </view>
         <view class="timetable_item2">
-          日期：{{ indexData.ClassPlan.NewPlanDateTimeStr }}
+          日期：{{ indexData.ClassPlan.NewPlanDateTimeStr || "暂无" }}
         </view>
         <view class="timetable_item2">
           时间：{{ indexData.ClassPlan.TimeStr
-          }}{{ indexData.ClassPlan.TimeStart }}
+          }}{{ indexData.ClassPlan.TimeStart || "暂无" }}
         </view>
         <view class="timetable_item2">
-          老师：{{ indexData.ClassPlan.TeacherName }}
+          老师：{{ indexData.ClassPlan.TeacherName || "暂无" }}
         </view>
         <view class="timetable_item2">
           状态：