1

pages/myClass/myClass.js

@@ -422,13 +422,13 @@ Page({
   // },
   // 跳转直播点播页面
   goStudy(e) {
-    if (this.data.istask1 == false) {
-      wx.showModal({
-        showCancel: false,
-        content: "请按照任务顺序执行哦！"
-      })
-      return false
-    }
+    // if (this.data.istask1 == false) {
+    //   wx.showModal({
+    //     showCancel: false,
+    //     content: "请按照任务顺序执行哦！"
+    //   })
+    //   return false
+    // }
     let id = e.currentTarget.dataset.item.id //此课程的id
     console.log(id)
     console.log(this.data.IngCourseArr, "我是筛选的列表")
@@ -472,7 +472,7 @@ Page({
       } else {
         wx.showModal({
           showCancel: false,
-          content: "您有未完成的学习课程，请先完成学习任务后再进行其他课程学习！"
+          content: "您的"+this.data.IngCourseArr.courseName+"课还未学完,快去学习吧"
         })
       }
     }

pages/myMission/myMission.js

@@ -17,6 +17,7 @@ Page({
     istask3: false,
     istask4: false,
     istask5: false,
+    istask6: false,
     studentName: "",
     classInfo: {},
     byzsbj: "../../images/zsbj.jpg",
@@ -249,7 +250,7 @@ Page({
   },
   // 领取结业证
   lq() {
-    if (this.data.istask4 == false) {
+    if (this.data.istask5 == false) {
       wx.showModal({
         showCancel: false,
         content: "请按照任务顺序执行哦！"
@@ -492,10 +493,10 @@ Page({
       }
     })
   },
-  // 检查第四个任务 综合反馈表
+  // 期末考试任务检查
   checkTaskList4(sessionKey) {
     wx.request({
-      url: app.globalData.publicUrl + '/wx/exam/status',
+      url: app.globalData.publicUrl + '/wx/exam/clasExamstatus',
       method: "post",
       data: {
         sessionKey: sessionKey
@@ -510,16 +511,17 @@ Page({
       }
     })
   },
+  // 检查第五个任务 综合反馈表
   checkTaskList5(sessionKey) {
     wx.request({
-      url: app.globalData.publicUrl + '/wx/student/wxGraduation',
+      url: app.globalData.publicUrl + '/wx/exam/status',
       method: "post",
       data: {
         sessionKey: sessionKey
       },
       success: (res) => {
         console.log(res.data, "我是第五个任务的检查状态")
-        if (res.data.code == 0 && res.data.code == 0) {
+        if (res.data.code == 0 && res.data.status == 0) {
           this.setData({
             istask5: true
           })
@@ -527,6 +529,23 @@ Page({
       }
     })
   },
+  checkTaskList6(sessionKey) {
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/wxGraduation',
+      method: "post",
+      data: {
+        sessionKey: sessionKey
+      },
+      success: (res) => {
+        console.log(res.data, "我是第六个任务的检查状态")
+        if (res.data.code == 0 && res.data.code == 0) {
+          this.setData({
+            istask6: true
+          })
+        }
+      }
+    })
+  },
   // 查询我是否有班&&班级名字
   isClass(sessionKey) {
     wx.request({
@@ -691,6 +710,45 @@ Page({
       }
     })
   },
+  goQmks() {
+    if (this.data.istask2 == false) {
+      wx.showModal({
+        showCancel: false,
+        content: "请按照任务顺序执行哦！"
+      })
+      return false
+    }
+    console.log(this.data.sessionKey);
+    console.log(this.data.classInfo.id);
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/exam/examList',
+      method: "post",
+      data: {
+        sessionKey: this.data.sessionKey,
+        clasId: this.data.classInfo.id
+      },
+      success: (res) => {
+        if (res.data.code == 0) {
+          console.log(res.data);
+          //let answersId =  res.data.list[0].answersId ;
+          console.log(res.data.list.length);
+          if (res.data.list[0]) {
+            if (res.data.list[0].answersId) {
+              if (res.data.list[0].status == '1') {
+                wx.navigateTo({
+                  url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
+                })
+              } else {
+                this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
+              }
+            } else {
+              this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
+            }
+          }
+        }
+      }
+    })
+  },
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
     this.setData({
@@ -702,6 +760,7 @@ Page({
     this.checkTaskList2(sessionKey)
     this.checkTaskList4(sessionKey)
     this.checkTaskList5(sessionKey)
+    this.checkTaskList6(sessionKey)
     // this.canvasImg();
     // this.getbyzsText();
   }

pages/myMission/myMission.wxml

@@ -41,15 +41,20 @@
 						<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
 					</view>
 					<view class="name">{{item.courseName}}</view>
-						<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
-						<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer" data-item="{{item}}"></image>
-						<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass" data-item="{{item}}"></image>
+					<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
+					<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer" data-item="{{item}}"></image>
+					<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass" data-item="{{item}}"></image>
 				</view>
 			</view>
 		</view>
 	</view>
+	<view class="step" bindtap="goQmks">
+	<image src='{{istask4==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
+			<image src='/images/finallytest.png' mode='aspectFill' class="bgimg1 layout"></image>
+		<!-- </view> -->
+	</view>
 	<view class="step" bindtap="goWrite2">
-		<image src='{{istask4==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
+		<image src='{{istask5==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="layout">
 			<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 			<view class="layout_text1">综合反馈表</view>
@@ -57,14 +62,14 @@
 		</view>
 	</view>
 	<view class="step">
-		<image src='{{istask5==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
+		<image src='{{istask6==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="pz">注：领取结业证需完成所有课程</view>
 	</view>
 	<view wx:if="{{ showzs }}" style="position:absolute;bottom:0;height:100vh;width:100%;background-color:rgba(13,13,13,0.7)">
 		<canvas canvas-id="{{myCanvasId}}" style="width:300px;height:415px;margin:100rpx auto 30rpx auto"></canvas>
 		<button bindtap="saveZs" size="mini" type="default" style="color:#000;font-size:14px;margin-left:200rpx;">保存证书</button>
-		<button bindtap="onClose1"  size="mini" type="default"  style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>
+		<button bindtap="onClose1" size="mini" type="default" style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>
 	</view>
 	<!-- <van-popup show="{{ showzs }}" bind:close="onClose1">
 		<view style="position:relative">