00

pages/myClass/myClass.js

@@ -83,11 +83,6 @@ Page({
     })
   },
   // 随堂考试
-  // gokhAnswer() {
-  //   wx.navigateTo({
-  //     url: '../answerAfterclass/answerAfterclass'
-  //   })
-  // },
   gokhAnswer(e) {
     if (this.data.istask1 == false) {
       wx.showModal({
@@ -137,11 +132,10 @@ Page({
       }
     }
     // console.log(e.currentTarget.dataset.courseid, "00");
-
-
   },
   //我的班级去评价
   gopjClass(e) {
+    console.log("000");
     if (this.data.istask1 == false) {
       wx.showModal({
         showCancel: false,
@@ -166,7 +160,7 @@ Page({
           data: {
             sessionKey: this.data.sessionKey,
             questSub: '3',
-            courseId: e.currentTarget.dataset.id,
+            courseId: e.currentTarget.dataset.item.id,
             clasId: this.data.classInfo.id
           },
           success: (res) => {
@@ -175,13 +169,7 @@ Page({
               //let answersId =  res.data.list[0].answersId ;
               if (res.data.list[0]) {
                 if (res.data.list[0].answersId) {
-                  if (res.data.list[0].status == '1') {
-                    wx.navigateTo({
-                      url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + res.data.list[0].answersId,
-                    })
-                  } else {
-                    this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'evaluationCourse');
-                  }
+                  this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'evaluationCourse');
                 } else {
                   console.log('777777');
                   this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'evaluationCourse');
@@ -290,19 +278,15 @@ Page({
       showzs: false
     });
   },
-  // 期末考试
-  // goQmks() {
-  //   this.getgoQmks();
-  // },
   // 期末考试接口 、、、、、、
   goQmks() {
-    if (this.data.istask2 == false) {
-      wx.showModal({
-        showCancel: false,
-        content: "请按照任务顺序执行哦！"
-      })
-      return false
-    }
+    // 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({
@@ -320,8 +304,27 @@ Page({
           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,
+                wx.request({
+                  url: app.globalData.publicUrl + '/wx/answer/detail',
+                  method: "post",
+                  data: {
+                    answersId: res.data.list[0].answersId
+                  },
+                  success: (res1) => {
+                    console.log(res,"纯涤的字  是是是是 ");
+                    
+                    if (res1.data.list[0].answerScore) {
+                      wx.navigateTo({
+                        url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
+                      })
+                    } else {
+                      wx.showModal({
+                        showCancel: false,
+                        content: '当前老师批阅中,请耐心等待',
+                        success(res) {}
+                      })
+                    }
+                  }
                 })
               } else {
                 this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
@@ -352,35 +355,57 @@ Page({
     }
     console.log(this.data.sessionKey, "dayin");
     console.log(this.data.classInfo.id);
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/exam/quesExamList',
-      method: "post",
-      data: {
-        sessionKey: this.data.sessionKey,
-        questSub: '1',
-        clasId: this.data.classInfo.id
-      },
-      success: (res) => {
-        if (res.data.code == 0) {
-          console.log(res.data, "zonghe");
-          //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') {
+    //  已经完成的
+    console.log(this.data.istask4, "0000");
+    if (this.data.istask4) {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/quesExamList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          questSub: '1',
+          clasId: this.data.classInfo.id
+        },
+        success: (res) => {
+          if (res.data.code == 0) {
+            if (res.data.list[0]) {
+              if (res.data.list[0].answersId) {
                 wx.navigateTo({
                   url: '/pages/feedBackDetail/feedBackDetail?answersId=' + res.data.list[0].answersId,
                 })
               } else {
+                this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'feedBack');
+              }
+            }
+          }
+        }
+      })
+    } else {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/quesExamList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          questSub: '1',
+          clasId: this.data.classInfo.id
+        },
+        success: (res) => {
+          if (res.data.code == 0) {
+            console.log(res.data, "zonghe");
+            //let answersId =  res.data.list[0].answersId ;
+            console.log(res.data.list.length);
+            if (res.data.list[0]) {
+              if (res.data.list[0].answersId) {
+
                 this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'feedBack');
+              } else {
+                this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'feedBack');
               }
-            } else {
-              this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'feedBack');
             }
           }
         }
-      }
-    })
+      })
+    }
   },
   toPath(id, paperId, answersId, address, status) {
     wx.navigateTo({
@@ -472,7 +497,7 @@ Page({
       } else {
         wx.showModal({
           showCancel: false,
-          content: "您的"+this.data.IngCourseArr.courseName+"课还未学完,快去学习吧"
+          content: "您的" + this.data.IngCourseArr.courseName + "课还未学完,快去学习吧"
         })
       }
     }
@@ -487,11 +512,12 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res.data.code, "我是返回是否有班级")
+        console.log(res, "我是返回是否有班级")
         if (res.data.code == 0) {
           this.setData({
             classInfo: res.data.data
           })
+          this.checkTaskList4(sessionKey, res.data.data.id);
           this.isAgree(sessionKey);
         } else {
           wx.showModal({
@@ -577,7 +603,7 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
-        console.log(res, "kckckc")
+        console.log(res, "11111111111111111111111111111111")
         this.setData({
           kcArr: res.data.list,
           istask3: res.data.allDone
@@ -668,16 +694,18 @@ Page({
     })
   },
   // 综合反馈任务check
-  checkTaskList4(sessionKey) {
+  checkTaskList4(sessionKey, id) {
+    console.log(this.data.classInfo, "777777");
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/status',
       method: "post",
       data: {
-        sessionKey: sessionKey
+        sessionKey: sessionKey,
+        clasId: id
       },
       success: (res) => {
         console.log(res.data, "我是第四个任务的检查状态")
-        if (res.data.code == 0 && res.data.status == 0) {
+        if (res.data.code == 0 && res.data.status == 1) {
           this.setData({
             istask4: true
           })
@@ -685,6 +713,40 @@ Page({
       }
     })
   },
+  // 查看成绩
+  gockcj(e) {
+    console.log(e.currentTarget.dataset.item.isExamId);
+    if (e.currentTarget.dataset.item.isExamId) {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/answer/detail',
+        method: "post",
+        data: {
+          answersId: e.currentTarget.dataset.item.isExamId
+        },
+        success: (res) => {
+          console.log(res.data, "我是第四个任务的检查状态")
+          if (res.data.list[0].answerScore) {
+            wx.navigateTo({
+              url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: '当前老师批阅中,请耐心等待',
+              success(res) {}
+            })
+          }
+        }
+      })
+    }
+  },
+  // 查看评价
+  gockpj(e) {
+    console.log(e.currentTarget.dataset.item.isFeedbackId);
+    wx.navigateTo({
+      url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + e.currentTarget.dataset.item.isFeedbackId,
+    })
+  },
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
     console.log(sessionKey, "000000");
@@ -697,6 +759,6 @@ Page({
     this.getMynotice(sessionKey);
     this.checkTaskList1(sessionKey)
     this.checkTaskList3(sessionKey)
-    this.checkTaskList4(sessionKey)
+
   }
 })

pages/myClass/myClass.wxml

@@ -23,7 +23,8 @@
 	<view class="layout" bindtap="goWrite">
 		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">学员登记表</view>
-		<view class="layout_text2">去填写</view>
+		<view class="layout_text2" wx:if='{{istask1}}'>查看详情</view>  
+		<view class="layout_text2" wx:else>去填写</view>
 	</view>
 	<view class="{{!showMore? 'hiddenmore' : 'showmore'}}">
 		<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
@@ -43,8 +44,13 @@
 					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view> -->
 				<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" data-item="{{item}}" bindtap="gokhAnswer"></image>
-					<image src='/images/pjkc.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
+
+					<image src='/images/dtxs.png' wx:if='{{item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
+					<image src='/images/pjkc.png' wx:if='{{item.isFeedback==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
+
+					<image src='/images/ckcj.png' wx:if='{{item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
+					<image src='/images/ckpj.png' wx:if='{{item.isFeedback==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockpj"></image>
+
 				</view>
 			</view>
 		</view>
@@ -66,7 +72,9 @@
 	<view class="layout" style="margin-top:40rpx" bindtap="goWrite2">
 		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">综合反馈表</view>
-		<view class="layout_text3">去填写</view>
+
+		<view class="layout_text2" wx:if='{{istask4}}'>查看详情</view>
+		<view class="layout_text2" wx:else>去填写</view>  
 	</view>
 	<view class="qy_title" bindtap="goMyPoints">
 		<view class="redk"></view>我的积分：80积分