0717最终版

app.json

@@ -1,25 +1,18 @@
 {
   "pages": [
+    "pages/welcome/welcome",
     "pages/testAnswer/testAnswer",
     "pages/myClass/myClass",
-  
     "pages/last/last",
-   
-    "pages/welcome/welcome",
     "pages/index/index",
-   
-    "pages/personInfo/personInfo",
-   
+    "pages/personInfo/personInfo", 
     "pages/lastdetail/lastdetail",
     "pages/lastdetailDetail/lastdetailDetail",
     "pages/answerAfterclasses/answerAfterclasses",
-   
     "pages/studentRegistration/studentRegistration",
     "pages/evaluationCourse/evaluationCourse",
     "pages/studentRegistrationDeyail/studentRegistrationDeyail",
     "pages/feedBack/feedBack",
-  
-   
     "pages/answerAfterclass/answerAfterclass",
     "pages/feedBackDetail/feedBackDetail",
     "pages/evaluationCourseDetail/evaluationCourseDetail",

pages/demandCourses/demandCourses.wxml

@@ -24,7 +24,7 @@
 			</view>
 		</view>
 	</view>
-		<view wx:if="{{showNull}}">
+	<view wx:if="{{showNull}}">
 		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
 		<view class="nodata_text">暂无数据</view>
 	</view>

pages/last/last.js

@@ -4,6 +4,7 @@ const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
+    showNull: false,
     dataArr: [
       // {
       //   "image": "/images/scdj1.jpg",
@@ -116,18 +117,27 @@ Page({
         clasId: this.data.classInfo.id
       },
       success: (res) => {
-        console.log(res, "00000000000000000000000");
         if (res.data.code == 0) {
-          this.setData({
-            dataArr: res.data.list
-          })
+          if (res.data.list.length == 0) {
+            this.setData({
+              showNull: true
+            })
+          } else {
+            this.setData({
+              dataArr: res.data.list
+            })
+          }
         }
+      },
+      fail: () => {
+        this.setData({
+          showNull: true
+        })
       }
     })
   },
   // 查询我是否有班&&班级名字
   isClass(sessionKey) {
-    // let _this = this;
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selMyClas',
       method: "post",

pages/last/last.wxml

@@ -1,15 +1,15 @@
 <view class="container">
 	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-		<!-- <image src="{{item.image}}" mode='aspectFill' class="scimg"></image> -->
 		<view class="sctext">
 			<view class="t1">{{item.examName}}</view>
-			<!-- {{ times(item.examBegin)}} -->
-			<view class="t2">主讲人: {{item.lecturer}} <text style="margin-left:20rpx"></text>{{ item.examBegin}}</view>
+			<view class="t2">主讲人: {{item.lecturer}} </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 class="t3" bindtap="startAnswer" data-idx='{{item.id}}' data-paperId='{{item.paperId}}'>继续答题</view> -->
 		</view>
-		<!-- <view wx:if='{{item.status == 0}}' class="isanswertag">未答题</view>
-		<view wx:else class="isanswertag" class="isanswertag isanswertag1">已答题</view> -->
+	</view>
+		<view wx:if="{{showNull}}">
+		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+		<view class="nodata_text">暂无数据</view>
 	</view>
 </view>

pages/last/last.wxss

@@ -16,36 +16,42 @@
   float: left;
   margin-top: 20rpx;
 }
-.sctext{
-margin-left: 20rpx;
-height: 165rpx;
-width: 530rpx;
-/* border: 1px solid red;   */
+
+.sctext {
+  margin-left: 20rpx;
+  height: 165rpx;
+  width: 530rpx;
+  /* border: 1px solid red;   */
 }
-.t1{
+
+.t1 {
   color: #000;
   font-size: 28rpx;
-  margin-top: 45rpx;
+  margin-top: 10rpx;
   font-weight: 700;
 }
-.t2{
+
+.t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;
 }
-.t3{
+
+.t3 {
   color: #fff;
   font-size: 24rpx;
   line-height: 30rpx;
   margin-top: 10rpx;
   width: 140rpx;
   border-radius: 20rpx;
-  background-color: rgba(255,125,127);
+  background-color: rgba(255, 125, 127);
   text-align: center;
   display: inline-block;
- 
+  padding: 5rpx;
+
 }
-.isanswertag{
+
+.isanswertag {
   width: 140rpx;
   background-color: #b9b9b9;
   height: 40rpx;
@@ -58,6 +64,23 @@ width: 530rpx;
   font-size: 24rpx;
   text-align: center;
 }
+
 .isanswertag1 {
   background-color: #EC725D;
+}
+
+.nodata {
+  position: absolute;
+  top: 285rpx;
+  left: 205rpx;
+  width: 340rpx;
+  height: 262rpx;
+}
+
+.nodata_text {
+  position: absolute;
+  top: 550rpx;
+  left: 310rpx;
+  font-size: 30rpx;
+  color: #666666;
 }

pages/myClass/myClass.js

@@ -587,12 +587,20 @@ Page({
         },
         success: (res) => {
           if (res.data.code == 0) {
-            console.log(res.data, "zonghe");
-            console.log(res.data.list.length);
-            if (res.data.list[0]) {
+            if (res.data.list.length == 0) {
+              wx.showModal({
+                showCancel: false,
+                content: '当前综合反馈还不可以填写哦！'
+              })
+            } else {
               if (res.data.list[0].answersId) {
-
-                this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'feedBack');
+                if (res.data.list[0].status == '1') {
+                  wx.navigateTo({
+                    url: '/pages/feedBackDetail/feedBackDetail?answersId=' + res.data.list[0].answersId,
+                  })
+                } else {
+                  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');
               }

pages/myMission/myMission.js

@@ -160,7 +160,7 @@ Page({
     })
   },
   // (第三个任务在获取列表是做了 --getMycourse()) 第四个任务  期末考试
-  checkTaskList4(sessionKey,id) {
+  checkTaskList4(sessionKey, id) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/clasExamstatus',
       method: "post",
@@ -179,7 +179,7 @@ Page({
     })
   },
   // 检查第五个任务 综合反馈表
-  checkTaskList5(sessionKey,id) {
+  checkTaskList5(sessionKey, id) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/status',
       method: "post",
@@ -229,8 +229,8 @@ Page({
           this.setData({
             classInfo: res.data.data
           })
-          this.checkTaskList4(sessionKey,res.data.data.id)
-          this.checkTaskList5(sessionKey,res.data.data.id)
+          this.checkTaskList4(sessionKey, res.data.data.id)
+          this.checkTaskList5(sessionKey, res.data.data.id)
         } else {
           wx.showModal({
             content: "您当前还没有开放的班级！",
@@ -564,21 +564,27 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res.data, "zonghe");
-          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/feedBackDetail/feedBackDetail?answersId=' + res.data.list[0].answersId,
-                })
+          if (res.data.list.length == 0) {
+            wx.showModal({
+              showCancel: false,
+              content: '当前综合反馈还不可以填写哦！'
+            })
+          } else {
+            if (res.data.list[0]) {
+              if (res.data.list[0].answersId) {
+                if (res.data.list[0].status == '1') {
+                  wx.navigateTo({
+                    url: '/pages/feedBackDetail/feedBackDetail?answersId=' + res.data.list[0].answersId,
+                  })
+                } else {
+                  this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'feedBack');
+                }
               } else {
-                this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'feedBack');
+                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');
             }
           }
+
         }
       }
     })
@@ -761,8 +767,8 @@ Page({
     this.getMycourse(sessionKey);
     this.checkTaskList(sessionKey)
     this.checkTaskList2(sessionKey)
-   
-   
+
+
     this.checkTaskList6(sessionKey)
   }
 })

pages/studentRegistrationDeyail/studentRegistrationDeyail.js

@@ -1,76 +0,0 @@
-//index.js
-//获取应用实例
-const app = require('../../utils/util.js');
-const tools = require('../../utils/tools.js');
-Page({
-  data: {
-    // 课程轮播
-    "bnrUrl": [{
-      "url": "/images/banner2.jpg",
-      "name": "二期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner1.jpg",
-      "name": "三期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }, {
-      "url": "/images/banner2.jpg",
-      "name": "四期素质教育培训",
-      "zbf": "xx委员会",
-      "starttime": "2020年6月"
-    }],
-    gridArr: [
-      // {
-      //   "num": "1",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "2",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-      // {
-      //   "num": "3",
-      //   "qusetion": "深入贯彻习近平总书记关于加大社会组织党建工作 力度的重要批示精神，坚决落实社会组织与社会组 织党组织“五个同步”，五个同步是以下哪一个？",
-      //   'daanTrue': 'Ｂ. 同培育、同孵化、同年检',
-      //   'daanFalse': 'A. 同培育、同孵化、同年检、同评估',
-      // },
-    ],
-
-  },
-  chengji(sessionKey, answersId) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/answer/detail',
-      method: "post",
-      data: {
-        sessionKey: sessionKey,
-        answersId: answersId
-      },
-      success: (res) => {
-        if (res.data.code == 0) {
-          console.log(res, "suoyoude");
-          this.setData({
-            gridArr:res.data.list
-          })
-          console.log(this.data.gridArr);
-        }
-      }
-    })
-  },
-  onReady: function () {},
-  async onLoad(options) {
-    console.log(options.answersId);
-    console.log("onload..................................");
-    let answersId = options.answersId;
-    const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
-    //const sessionKey = await tools.checkSessionAndLogin();  
-    this.chengji(sessionKey, answersId);
-
-  },
-
-})

pages/studentRegistrationDeyail/studentRegistrationDeyail.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText":"学员登记表",
-  "navigationBarBackgroundColor": "#eb3f33",
-  "navigationBarTextStyle": "white"
-}

pages/studentRegistrationDeyail/studentRegistrationDeyail.wxml

@@ -1,24 +0,0 @@
-<view class="home">
-	<view class="box">
-		<view class="redk"></view>学员登记表
-		<view class="cuoti-box" wx:for="{{gridArr}}">
-			<view class="number">
-				{{index+1}}
-			</view>
-			<view class="wenti">
-				<view style=" margin-right: 20rpx;">
-					{{item.questStem}} ：{{item.currentAnswer}}
-				</view>
-				<!-- <view class="daan">
-					正确答案: <view class="zhengquedaan">{{item.correctAnswer}}</view>
-				</view> -->
-				<!-- <view class="daan">
-					我的答案: <view class="wodedaan">{{item.currentAnswer}}</view>
-				</view>
-				<view class="daan">
-					分数: <view class="wodedaan">{{item.score}}</view>
-				</view> -->
-			</view>
-		</view>
-	</view>
-</view>

pages/studentRegistrationDeyail/studentRegistrationDeyail.wxss

@@ -1,87 +0,0 @@
-
-.box {
-  margin: 0 40rpx;
-  background-color: white;
-  border-radius: 20rpx;
-  padding-top: 30rpx;
-  font-size: 26rpx;
-  padding-bottom: 20rpx;
-}
-.yuan{
-  height: 160rpx;
-  width: 160rpx;
-  border-radius: 50%;
-  background-color: white;
-   display: flex;
-   flex-direction: column;
-   text-align: center;
-  margin: 0 auto;
-   
-}
-.title{
-  font-size: 20rpx;
-  color: white;
-}
-.fen{
-  font-size: 50rpx;
-  color: white;
-  margin-top: 10rpx;
-}
-.nei{
-  height: 123rpx;
-  width: 123rpx;
-  background-color: #EB3F33;
-  border-radius: 50%;
-  margin: 0 auto;
-  margin-top: 18rpx;
-  box-shadow:rgba(235,63,51,0.3) 0px 0px 20px;
-  
-}
-.redk {
-  height: 33rpx;
-  width: 8rpx;
-  background-color: #eb3f33;
-  border-radius: 5rpx;
-  margin-right: 10rpx;
-  margin-left: 40rpx;
-  float: left;
-}
-.cuoti-box{
-  background:rgba(172,213,152,0.2);
-  border-radius:7rpx;
-  display: flex;
-  margin: 40rpx;
-  padding-top: 10rpx;
-  padding-left: 10rpx;
-}
-.wenti{
-  text-align: justify;
-  font-size: 25rpx;
-  margin-left: 20rpx;
-  width: 620rpx;
-}
-.daan{
-  font-size: 21rpx;
-  margin: 20rpx 20rpx 20rpx 0rpx;
-}
-.number{
-  height: 30rpx;
-  line-height: 30rpx;
-  width: 34rpx;
-  border-radius: 34rpx;
-  border: 1rpx solid black;
-  text-align: center;
-}
-.zhengquedaan{
-  display: inline-block;
-  color: #00B627;
-}
-.wodedaan{
-  display: inline-block;
-  color: #EB3F33;
-}
-
-page {
-  background:#F4F4F4
-  
-}

pages/testAnswer/testAnswer.js

@@ -4,6 +4,7 @@ const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
+    showNull: false,
     dataArr: [
       // {
       //   "image": "/images/scdj1.jpg",
@@ -82,7 +83,7 @@ Page({
       },
       success: (res) => {
         console.log(res);
-        
+
         if (res.data.code == 0) {
           console.log(res, "suoyoude");
           // wx.navigateTo({
@@ -156,12 +157,21 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res, "suoyoude");
-          this.setData({
-            dataArr: res.data.list
-          })
-          console.log(this.data.dataArr, ":000000");
+          if (res.data.list.length == 0) {
+            this.setData({
+              showNull: true
+            })
+          } else {
+            this.setData({
+              dataArr: res.data.list
+            })
+          }
         }
+      },
+      fail: () => {
+        this.setData({
+          showNull: true
+        })
       }
     })
   },

pages/testAnswer/testAnswer.wxml

@@ -3,13 +3,16 @@
 		<image src="{{item.image}}" mode='aspectFill' class="scimg"></image>
 		<view class="sctext">
 			<view class="t1">{{item.examName}}</view>
-			<!-- {{ times(item.examBegin)}} -->
-			<view class="t2">主讲人: {{item.lecturer}} <text style="margin-left:20rpx"></text>{{ item.examBegin}}</view>
+			<view class="t2">主讲人: {{item.lecturer}}</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 class="t3" bindtap="startAnswer" 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:else class="isanswertag" class="isanswertag isanswertag1">已答题</view>
+		<view wx:if='{{item.status == 1}}' class="isanswertag" class="isanswertag isanswertag1">已答题</view>
+	</view>
+	<view wx:if="{{showNull}}">
+		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
+		<view class="nodata_text">暂无数据</view>
 	</view>
 </view>

pages/testAnswer/testAnswer.wxss

@@ -16,36 +16,41 @@
   float: left;
   margin-top: 20rpx;
 }
-.sctext{
-float: right;
-height: 165rpx;
-width: 530rpx;
-/* border: 1px solid red;   */
+
+.sctext {
+  float: right;
+  height: 165rpx;
+  width: 530rpx;
+  /* border: 1px solid red;   */
 }
-.t1{
+
+.t1 {
   color: #000;
   font-size: 28rpx;
-  margin-top: 45rpx;
+  margin-top: 10rpx;
   font-weight: 700;
 }
-.t2{
+
+.t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;
 }
-.t3{
+
+.t3 {
   color: #fff;
   font-size: 24rpx;
   line-height: 30rpx;
   margin-top: 10rpx;
   width: 140rpx;
   border-radius: 20rpx;
-  background-color: rgba(255,125,127);
+  background-color: rgba(255, 125, 127);
   text-align: center;
   display: inline-block;
- 
+  padding: 5rpx;
 }
-.isanswertag{
+
+.isanswertag {
   width: 140rpx;
   background-color: #b9b9b9;
   height: 40rpx;
@@ -58,6 +63,23 @@ width: 530rpx;
   font-size: 24rpx;
   text-align: center;
 }
+
 .isanswertag1 {
   background-color: #EC725D;
+}
+
+.nodata {
+  position: absolute;
+  top: 285rpx;
+  left: 205rpx;
+  width: 340rpx;
+  height: 262rpx;
+}
+
+.nodata_text {
+  position: absolute;
+  top: 550rpx;
+  left: 310rpx;
+  font-size: 30rpx;
+  color: #666666;
 }