1

pages/last/last.wxml

@@ -1,12 +1,14 @@
 <view class="container">
 	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-		<view class="sctext">
+		<!-- <view class="sctext"> -->
 			<view class="t1">{{item.examName}}</view>
 			<view class="t2">主讲人: {{item.lecturer}} </view>
-			<view class="t2">{{item.examBegin}}至{{item.examEnd}}</view>
+			<view class="t2">答卷时间：{{item.examBegin}}至{{item.examEnd}}</view>
 			<view wx:if='{{item.status == 0}}' class="t3" bindtap="startAnswer" data-answersId='{{item.answersId}}' data-idx='{{item.id}}' data-paperId='{{item.paperId}}'>开始答题</view>
 			<view  wx:if='{{item.status == 1}}' class="t3"  bindtap="lookAnswer" data-answersId='{{item.answersId}}'>查看答案</view>
-		</view>
+			<view wx:if='{{item.status == 0}}' class="isanswertag">未答题</view>
+		<view wx:if='{{item.status == 1}}' class="isanswertag" class="isanswertag isanswertag1">已答题</view>
+		<!-- </view> -->
 	</view>
 		<view wx:if="{{showNull}}">
 		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>

pages/last/last.wxss

@@ -2,11 +2,10 @@
   width: 710rpx;
   margin-left: 20rpx;
   height: 165rpx;
-  padding-bottom: 30rpx;
+  padding-bottom: 50rpx;
   /* border: 1px solid red; */
   /* margin-top: 30rpx; */
   position: relative;
-  /* border: 1px solid red; */
   border-bottom: 1px solid #d4d4d4;
 }
 
@@ -17,13 +16,6 @@
   margin-top: 20rpx;
 }
 
-.sctext {
-  margin-left: 20rpx;
-  height: 165rpx;
-  width: 530rpx;
-  /* border: 1px solid red;   */
-}
-
 .t1 {
   color: #000;
   font-size: 28rpx;
@@ -48,7 +40,7 @@
   text-align: center;
   display: inline-block;
   padding: 5rpx;
-
+  /* margin-bottom: 30rpx; */
 }
 
 .isanswertag {

pages/lastdetail/lastdetail.js

@@ -229,8 +229,8 @@ Page({
     wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
     wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
     console.log(this.data.questionList);
-    console.log( this.data.chooseValue,"0000");
-    
+    console.log(this.data.chooseValue, "0000");
+
     // this.data.questionList[this.data.index].checked = e.detail.value;
 
     // this.setData({
@@ -413,9 +413,16 @@ Page({
             success(res) {}
           })
         } else {
-          wx.navigateTo({
-            url: '/pages/last/last',
+          wx.showModal({
+            showCancel: false,
+            content: "提交成功",
+            success() {
+              wx.navigateTo({
+                url: '/pages/last/last',
+              })
+            }
           })
+
         }
 
       }

pages/lastdetail/lastdetail.wxml

@@ -81,6 +81,6 @@
 
 		</view>
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
-			<van-button   round bindtap="submitForm">提交表单</van-button>
+			<van-button   round bindtap="submitForm">提交</van-button>
 		</view>
 </view>

pages/myClass/myClass.js

@@ -164,7 +164,7 @@ Page({
       },
       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({
             istask3: true
           })
@@ -618,6 +618,13 @@ Page({
   },
   // 领取结业证
   lq() {
+    if (this.data.istask4 == false) {
+      wx.showModal({
+        showCancel: false,
+        content: "请按照任务顺序执行哦！"
+      })
+      return false
+    }
     wx.showLoading({
       mask: true,
       title: '加载中',

pages/myTraining/myTraining.js

@@ -16,12 +16,12 @@ Page({
         content: "还未到开班时间哦"
       })
     }
-    if (e.currentTarget.dataset.item.isActive == 2) {
+    if (e.currentTarget.dataset.item.isActive == 1) {
       wx.switchTab({
         url: '../myClass/myClass'
       })
     }
-    if (e.currentTarget.dataset.item.isActive == 1) {
+    if (e.currentTarget.dataset.item.isActive == 2) {
       wx.navigateTo({
         url: '../historyClass/historyClass?id=' + id + '&&name=' + name + '&&clasEnd=' + clasEnd
       })

pages/testAnswer/testAnswer.js

@@ -145,7 +145,6 @@ Page({
 
     // }
     this.getBanner(sessionKey);
-    //....................
   },
   getBanner(sessionKey) {
     console.log(sessionKey, "sessionKey");
@@ -162,6 +161,7 @@ Page({
               showNull: true
             })
           } else {
+            console.log(res.data.list)
             this.setData({
               dataArr: res.data.list
             })

pages/testAnswer/testAnswer.wxss

@@ -36,7 +36,6 @@
   font-size: 24rpx;
   margin-top: 10rpx;
 }
-
 .t3 {
   color: #fff;
   font-size: 24rpx;
@@ -44,7 +43,7 @@
   margin-top: 10rpx;
   width: 140rpx;
   border-radius: 20rpx;
-  background-color: rgba(255, 125, 127);
+  background-color: #ff7d7f;
   text-align: center;
   display: inline-block;
   padding: 5rpx;