11

app.json

@@ -1,10 +1,13 @@
 {
   "pages": [
     "pages/welcome/welcome",
+    "pages/answerAfterclass/answerAfterclass",
+    "pages/zbDetails/zbDetails",
+    "pages/answerAfterclasses/answerAfterclasses",
+    "pages/studentRegistration/studentRegistration",
     "pages/dbDetails/dbDetails",
     "pages/dbVideo/dbVideo",
     "pages/myClass/myClass",
-    "pages/zbDetails/zbDetails",
     "pages/Identity/Identity",
     "pages/grade/grade",
     "pages/livePlayback/livePlayback", 
@@ -18,16 +21,13 @@
     "pages/groupsList/groupsList",
     "pages/schoolIntrouce/schoolIntrouce",
     "pages/InteractiveQA/InteractiveQA",
-    "pages/studentRegistration/studentRegistration",
     "pages/last/last",
     "pages/index/index",
     "pages/personInfo/personInfo",
     "pages/lastdetail/lastdetail",
     "pages/lastdetailDetail/lastdetailDetail",
-    "pages/answerAfterclasses/answerAfterclasses",
     "pages/evaluationCourse/evaluationCourse",
     "pages/feedBack/feedBack",
-    "pages/answerAfterclass/answerAfterclass",
     "pages/feedBackDetail/feedBackDetail",
     "pages/evaluationCourseDetail/evaluationCourseDetail",
     "pages/historyClass/historyClass",

components/trtc-room/trtc-room.js

@@ -253,7 +253,7 @@ Component({
    */
   methods: {
     fullScreen() {
-      console.log(this.data.streamList.length,'我是全屏时player的数量');
+      console.log(this.data.streamList,'我是全屏时player的数量');
       for (let i = 0; i < this.data.streamList.length; i++) {
         console.log(this.data.streamList[i])
         if(this.data.streamList[i].userID=="0"||this.data.streamList[i].userID=="share-userId"){

components/trtc-room/trtc-room.json

@@ -1,4 +1,5 @@
 {
   "component": true,
+  "disableSwipeBack":true,
   "usingComponents": {}
 }

pages/Identity/Identity.js

@@ -13,6 +13,7 @@ Page({
   },
   // 错误信息回显
   showModal(error) {
+    wx.hideLoading()
     wx.showModal({
       content: error.msg,
       showCancel: false,
@@ -60,6 +61,7 @@ Page({
             }
           })
         } else {
+          wx.hideLoading()
           wx.showModal({
             showCancel: false,
             content: res.data.msg
@@ -79,8 +81,9 @@ Page({
       const params = e.detail.value
       if (!this.WxValidate.checkForm(params)) {
         const error = this.WxValidate.errorList[0]
-        this.showModal(error)
         wx.hideLoading()
+        this.showModal(error)
+       
         return false
       }
       if (this.data.carWin_img == "" || this.data.carWin_img == null) {
@@ -112,6 +115,7 @@ Page({
             if (credentials) {
               stsCache = result.data.credential
             } else {
+              wx.hideLoading()
               wx.showModal({
                 title: '临时密钥获取失败',
                 content: JSON.stringify(data),
@@ -121,6 +125,7 @@ Page({
             callback(stsCache && stsCache.credentials);
           },
           error: function (err) {
+            wx.hideLoading()
             wx.showModal({
               title: '临时密钥获取失败',
               content: JSON.stringify(err),
@@ -169,6 +174,7 @@ Page({
             this.tj(params, res.header.Location)
           },
           fail: function () {
+            wx.hideLoading()
             wx.showModal({
               title: '上传腾讯云失败',
               showCancel: false
@@ -183,7 +189,7 @@ Page({
         });
       });
     } else {
-      // wx.hideLoading()
+      wx.hideLoading()
       wx.showModal({
         showCancel: false,
         content: "您已经认证过了"

pages/agoClass/agoClass.wxml

@@ -4,7 +4,7 @@
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
 			<view class="t2" wx:if="{{item.remark!=null}}">主办：{{item.remark}}</view>
-			<view class="t2" wx:if="{{item.remark!=null}}">承办：{{item.organizer}}</view>
+			<view class="t2" wx:if="{{item.organizer!=null}}">承办：{{item.organizer}}</view>
 			<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 		</view>
 	</view>

pages/answerAfterclass/answerAfterclass.js

@@ -95,6 +95,7 @@ Page({
           chooseValue: wx.getStorageSync('chooseValue' + this.data.answersId)
         })
       }
+      console.log(this.data.chooseValue, "000000")
       this.submitAll(this.data.chooseValue);
     }
   },
@@ -105,6 +106,10 @@ Page({
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
   },
   async onLoad(options) {
+    wx.showLoading({
+      title: '加载中',
+      task: true
+    })
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
@@ -117,6 +122,8 @@ Page({
       const questionList = wx.getStorageSync('questionList' + wx.getStorageSync('answersId'));
       const titleINDEX = wx.getStorageSync('titleINDEX' + wx.getStorageSync('answersId'));
       const chooseValue = wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId'));
+      console.log(wx.getStorageSync('questionList' + wx.getStorageSync('answersId')))
+      wx.hideLoading();
       this.setData({
         questionList: questionList,
         answersId: wx.getStorageSync('answersId'),
@@ -137,6 +144,7 @@ Page({
         paperId: paperId
       },
       success: (res) => {
+        console.log(res)
         let jsonArr = JSON.parse(res.data.paperContent).map(item => {
           let json = {};
           json.QuestType = item.QuestType;
@@ -183,53 +191,113 @@ Page({
 
           return json;
         })
+        wx.hideLoading();
         this.setData({
           questionList: jsonArr
         })
+        console.log(this.data.questionList)
         wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), 0);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), []),
           wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
+
+      },
+      fail: () => {
+        wx.hideLoading()
       }
     })
   },
   submitAll(currentAnswerTemp) {
+    // if(currentAnswerTemp.length==0){
+    //   currentAnswerTemp
+    // }
     wx.showLoading({
       mask: true,
       title: '加载中',
     })
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/paper/commit',
-      method: "post",
-      data: {
-        sessionKey: this.data.sessionKey,
-        currentAnswerTemp: currentAnswerTemp,
-        answersId: wx.getStorageSync('answersId')
-      },
-      success: (res) => {
-        wx.hideLoading();
-        if (res.data.code == 0) {
-          wx.showModal({
-            showCancel: false,
-            content: '恭喜您,提交答案成功，请耐心等待老师判卷',
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg,
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
+    if (currentAnswerTemp.length == 0) {
+      let arr = this.data.questionList.map(item => {
+        let json = {};
+        json.currentAnswer = '';
+        json.questType = item.QuestType;
+        json.id = item.id;
+        return json
+      });
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/paper/commit',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          currentAnswerTemp: arr,
+          answersId: wx.getStorageSync('answersId')
+        },
+        success: (res) => {
+          wx.hideLoading();
+          if (res.data.code == 0) {
+            wx.showModal({
+              showCancel: false,
+              content: '恭喜您,提交答案成功，请耐心等待老师判卷',
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: res.data.msg,
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          }
+        },
+        fail: () => {
+          wx.hideLoading()
         }
-      }
-    })
+      })
+    } else {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/paper/commit',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          currentAnswerTemp: currentAnswerTemp,
+          answersId: wx.getStorageSync('answersId')
+        },
+        success: (res) => {
+          wx.hideLoading();
+          if (res.data.code == 0) {
+            wx.showModal({
+              showCancel: false,
+              content: '恭喜您,提交答案成功，请耐心等待老师判卷',
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: res.data.msg,
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          }
+        },
+        fail: () => {
+          wx.hideLoading()
+        }
+      })
+    }
+
+
   }
 
 })

pages/answerAfterclass/answerAfterclass.wxml

@@ -38,7 +38,7 @@
 	<view class="qiu"></view>
 </view>
 <radio-group class="parameter-wrap" data-questTypes='{{questionList[index].QuestType}}' data-idx='{{questionList[index].id}}' bindchange="radioChange" wx:if="{{questionList[index].QuestType == 0}}">
-	<label class=" radio my-choosebox  {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{questionList[index].QuestChoice}}"  wx:key="{{item.value}}">
+	<label class=" radio my-choosebox  {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{questionList[index].QuestChoice}}" wx:key="{{item.value}}">
 		<radio value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}
 	</label>
 </radio-group>
@@ -48,7 +48,7 @@
 	</label>
 </checkbox-group>
 <radio-group class="parameter-wrap" data-questTypes='{{questionList[index].QuestType}}' data-idx='{{questionList[index].id}}' bindchange="radioChange" wx:if="{{questionList[index].QuestType == 2}}">
-	<label class=" radio my-choosebox  {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{questionList[index].QuestChoice}}"  wx:key="{{item.value}}">
+	<label class=" radio my-choosebox  {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{questionList[index].QuestChoice}}" wx:key="{{item.value}}">
 		<radio value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}
 	</label>
 </radio-group>

pages/answerAfterclass/answerAfterclass.wxss

@@ -18,10 +18,13 @@
 }
 
 .question {
-  margin: 50rpx 60rpx 0 60rpx;
+  margin:20rpx;
   color: white;
   text-align: justify;
   font-size: 28rpx;
+  height: 210rpx;
+  border: 1px solid #fff;
+  overflow-y: auto;
 }
 
 .qiu {

pages/answerAfterclasses/answerAfterclasses.js

@@ -98,14 +98,17 @@ Page({
    * 下一题/提交 按钮
    */
   nextSubmit: function () {
+    // console.log("0000")
     // 判断是不是最后一题
     if (this.data.index < this.data.questionList.length - 1) {
+      console.log(this.data.chooseValue,"0000000000000000")
       // 渲染下一题
       this.setData({
         index: this.data.index + 1
       })
       wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
     } else {
+      console.log(this.data.chooseValue,"1111111111")
       if (wx.getStorageSync('chooseValue' + this.data.answersId)) {
         this.setData({
           chooseValue: wx.getStorageSync('chooseValue' + this.data.answersId)
@@ -115,12 +118,14 @@ Page({
     }
   },
   upSubmit() {
+    console.log(this.data.chooseValue,"我点击上一题了")
     this.setData({
       index: this.data.index - 1
     })
     wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), this.data.index);
   },
   async onLoad(options) {
+    console.log("我是答题页","00000000000")
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
@@ -204,42 +209,122 @@ Page({
         wx.setStorageSync('titleINDEX' + wx.getStorageSync('answersId'), 0);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), []),
           wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
+      },
+      fail:()=>{
+        wx.hideLoading();
       }
     })
   },
   submitAll(currentAnswerTemp) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/paper/commit',
-      method: "post",
-      data: {
-        sessionKey: this.data.sessionKey,
-        currentAnswerTemp: currentAnswerTemp,
-        answersId: wx.getStorageSync('answersId')
-      },
-      success: (res) => {
-        if (res.data.code == 0) {
-          wx.showModal({
-            showCancel: false,
-            content: '恭喜您,提交答案成功，请耐心等待老师判卷',
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
+    console.log(currentAnswerTemp,"我是带过来的答案")
+    if (currentAnswerTemp.length == 0) {
+      let arr = this.data.questionList.map(item => {
+        let json = {};
+        json.currentAnswer = '';
+        json.questType = item.QuestType;
+        json.id = item.id;
+        return json
+      });
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/paper/commit',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          currentAnswerTemp: arr,
+          answersId: wx.getStorageSync('answersId')
+        },
+        success: (res) => {
+          wx.hideLoading();
+          if (res.data.code == 0) {
+            wx.showModal({
+              showCancel: false,
+              content: '恭喜您,提交答案成功，请耐心等待老师判卷',
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: res.data.msg,
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          }
         }
-         else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.msg,
-            success() {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          })
+      })
+    } else {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/paper/commit',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          currentAnswerTemp: currentAnswerTemp,
+          answersId: wx.getStorageSync('answersId')
+        },
+        success: (res) => {
+          wx.hideLoading();
+          if (res.data.code == 0) {
+            wx.showModal({
+              showCancel: false,
+              content: '恭喜您,提交答案成功，请耐心等待老师判卷',
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: res.data.msg,
+              success() {
+                wx.navigateBack({
+                  delta: 1
+                })
+              }
+            })
+          }
         }
-      }
-    })
+      })
+    }
+    // wx.request({
+    //   url: app.globalData.publicUrl + '/wx/paper/commit',
+    //   method: "post",
+    //   data: {
+    //     sessionKey: this.data.sessionKey,
+    //     currentAnswerTemp: currentAnswerTemp,
+    //     answersId: wx.getStorageSync('answersId')
+    //   },
+    //   success: (res) => {
+    //     if (res.data.code == 0) {
+    //       wx.showModal({
+    //         showCancel: false,
+    //         content: '恭喜您,提交答案成功，请耐心等待老师判卷',
+    //         success() {
+    //           wx.navigateBack({
+    //             delta: 1
+    //           })
+    //         }
+    //       })
+    //     }
+    //      else {
+    //       wx.showModal({
+    //         showCancel: false,
+    //         content: res.data.msg,
+    //         success() {
+    //           wx.navigateBack({
+    //             delta: 1
+    //           })
+    //         }
+    //       })
+    //     }
+    //   }
+    // })
   }
 })

pages/answerAfterclasses/answerAfterclasses.wxss

@@ -17,13 +17,22 @@
   color: #FFB71C;
 }
 
-.question {
+/* .question {
   margin: 50rpx 60rpx 0 60rpx;
   color: white;
   text-align: justify;
   font-size: 28rpx;
-}
 
+} */
+.question {
+  margin:20rpx;
+  color: white;
+  text-align: justify;
+  font-size: 28rpx;
+  height: 210rpx;
+  border: 1px solid #fff;
+  overflow-y: auto;
+}
 .qiu {
   width: 20rpx;
   height: 20rpx;

pages/dbDetails/dbDetails.js

@@ -226,7 +226,7 @@ Page({
         if (currentTime > jump_time && currentTime - jump_time > 3) {
           _this.data.videoContext.seek(_this.data.video_real_time)
           wx.showToast({
-            title: '未完整看完该视频，不能快进',
+            title: '该视频不可以快进哦！',
             icon: 'none',
             duration: 2000,
           })

pages/evaluationCourse/evaluationCourse.js

@@ -186,8 +186,8 @@ Page({
     })
   },
   submitForm() {
-    let obj = this.data.chooseValue.find(item=>!item.currentAnswer)
-    if(!obj){
+    let obj = this.data.chooseValue.find(item => !item.currentAnswer)
+    if (!obj) {
       wx.showLoading({
         mask: true,
         title: '加载中',
@@ -225,12 +225,11 @@ Page({
           }
         }
       })
-    }else{
+    } else {
       wx.showModal({
         showCancel: false,
         content: '请补全信息',
-        success() {
-        }
+        success() {}
       })
     }
   },
@@ -253,6 +252,10 @@ Page({
 
   },
   async onLoad(options) {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
@@ -268,7 +271,9 @@ Page({
         answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
         chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
+      wx.hideLoading();
     } else {
+      
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
     }
   },
@@ -314,6 +319,7 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
+        wx.hideLoading();
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
       }

pages/feedBack/feedBack.js

@@ -188,8 +188,8 @@ Page({
     })
   },
   submitForm() {
-    let obj = this.data.chooseValue.find(item=>!item.currentAnswer)
-    if(!obj){
+    let obj = this.data.chooseValue.find(item => !item.currentAnswer)
+    if (!obj) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/paper/commit',
         method: "post",
@@ -217,15 +217,14 @@ Page({
           }
         }
       })
-    }else{
+    } else {
       wx.showModal({
         showCancel: false,
-        content: '333333',
-        success() {
-        }
+        content: '请补全提交信息哦',
+        success() {}
       })
     }
-  
+
   },
   formSubmit(e) {
     let arr1 = this.data.zaizhiTime.filter(d => d);
@@ -271,6 +270,10 @@ Page({
 
   },
   async onLoad(options) {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
@@ -286,6 +289,7 @@ Page({
         answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
         chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
+      wx.hideLoading();
     } else {
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
     }
@@ -331,6 +335,7 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
+        wx.hideLoading();
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
       }

pages/feedBack/feedBack.wxml

@@ -24,7 +24,7 @@
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx;  position: relative; top: 8rpx; "> </image>
 				<view class="xingbie tebie">{{item.QuestStem}}</view>
 			</view>
-			<view class='weui-input' style=" background: white">
+			<view class='weui-input' style="background: white">
 				<radio-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}' bindchange="radioChange">
 					<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{item.QuestChoice}}">
 						<radio value="{{ item.value }}" />{{item.name}}
@@ -72,6 +72,6 @@
 			</view>
 		</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/feedBack/feedBack.wxss

@@ -150,25 +150,23 @@ textarea {
 
 .weui-input radio {
   display: none;
-
 }
 
 .weui-input checkbox {
   display: none;
 }
-
 .checkboxbox {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
 
 }
-
 .my-choosebox {
   color: rgba(51, 51, 51, 1);
-  width: 200rpx;
-  padding: 10rpx 80rpx;
+  width: 300rpx;
+  padding: 10rpx 20rpx;
   background: #FFF0ED;
-  margin: 10rpx;
-  line-height: 80rpx;
+  margin: 20rpx;
   border-radius: 10rpx;
+  display: block;
+  text-align: center;
 }

pages/historyClass/historyClass.js

@@ -4,16 +4,38 @@ Page({
   data: {
     kcArr: [],
     showZhfk: true,
-    istask:false
+    istask: false
   },
   // 跳转直播点播页面
   goStudy(e) {
-    let id = e.currentTarget.dataset.item.id
+    let id = e.currentTarget.dataset.item
+    let courseName = e.currentTarget.dataset.item.courseName
+    let courseUrl = e.currentTarget.dataset.item.courseUrl
+    let courseInfo = e.currentTarget.dataset.item.courseInfo
+    console.log(id)
     if (e.currentTarget.dataset.item.isLive == 1) {
-      wx.showModal({
-        showCancel: false,
-        content: "直播已经结束了哦"
-      })
+      if (e.currentTarget.dataset.item.isActive == 1) {
+        wx.navigateTo({
+          url: '../zbDetails/zbDetails?id=' + id
+        })
+      } else if (e.currentTarget.dataset.item.isActive == -1) {
+        if (courseUrl == null || courseUrl == "") {
+          wx.showModal({
+            showCancel: false,
+            content: "直播回放还未上传噢"
+          })
+        } else {
+          wx.navigateTo({
+            url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
+          })
+        }
+      } else {
+        wx.showModal({
+          showCancel: false,
+          content: "直播还未开始哦"
+        })
+        return false;
+      }
     } else {
       wx.navigateTo({
         url: '../dbDetails/dbDetails?id=' + id

pages/historyClass/historyClass.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText":"我的培训"
+  "navigationBarTitleText":"历史班级"
 }

pages/historyClass/historyClass.wxml

@@ -10,7 +10,7 @@
 				<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
 				<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
 				<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
-				<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
+				<!-- <view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view> -->
 				<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
 			</view>
 			<view class="name">{{item.courseName}}</view>
@@ -23,6 +23,6 @@
 		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">综合反馈表</view>
 		<view class="layout_text3" wx:if='{{istask}}'>查看详情</view>
-		<view class="layout_text3" wx:else>去填写</view>
+		<view class="layout_text3" wx:if='{{!istask}}'>去填写</view>
 	</view>
 </view>

pages/historyClass/historyClass.wxss

@@ -118,8 +118,7 @@
 
 .spfm {
   width: 128rpx;
-  height: auto;
-  /* margin-top: 20rpx; */
+  height: 128rpx;
   float: left;
   margin-top: 35rpx;
   margin-left: 20rpx;

pages/index/index.js

@@ -110,7 +110,7 @@ Page({
         sessionKey
       },
       success: (res) => {
-        if (res.data.data.claList.length != 0) {
+        if (res.data.data && res.data.data.claList.length != 0) {
           this.setData({
             bnrUrl: res.data.data.claList
           })
@@ -164,7 +164,7 @@ Page({
       }
     })
   },
-   // 四个宣传图onshow
+  // 四个宣传图onshow
   getfour1() {
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/listCategory',
@@ -180,7 +180,7 @@ Page({
       }
     })
   },
-   // 第一个小红点
+  // 第一个小红点
   getRedPoint1(sessionKey) {
     let completeStatus1 = `gridArr[${0}].isread`;
     let completeStatus2 = `gridArr[${1}].isread`;
@@ -219,6 +219,10 @@ Page({
           this.setData({
             [completeStatus]: false
           })
+        } else {
+          this.setData({
+            [completeStatus]: true
+          })
         }
       }
     })

pages/index/index.wxml

@@ -7,7 +7,7 @@
 					<image src='/images/mb.png' class='uimg' mode='aspectFill'></image>
 					<view class="text text0">{{item.clasName}}</view>
 					<view class="text text1" wx:if="{{item.remark}}">主办：{{item.remark}}</view>
-					<view class="text text2" wx:if="{{item.organizer}}">承办：{{item.remark}}</view>
+					<view class="text text2" wx:if="{{item.organizer}}">承办：{{item.organizer}}</view>
 					<view class="text text3" wx:if="{{item.beginDate}}">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 					<image src='/images/goclass.png' mode='aspectFill' class="gozbbtn" wx:if='{{item.isActive==5}}'></image>
 				</swiper-item>
@@ -31,7 +31,7 @@
 		<van-grid-item use-slot wx:for="{{gridArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" bindtap="goGrid" data-id="{{idx}}" style="position:relative">
 			<image style="width: 103rpx; height: 94rpx;" src="{{item.url}}" />
 			<text class="grid_text">{{item.name}}</text>
-			<view wx:if='{{item.isread==false}}' style="width:10rpx;height:10rpx;background-color:red;border-radius:30rpx;border:1rpx solid red;position:absolute;top:30rpx;right:30rpx"></view>
+			<view wx:if='{{!item.isread}}' style="width:10rpx;height:10rpx;background-color:red;border-radius:30rpx;border:1rpx solid red;position:absolute;top:30rpx;right:30rpx"></view>
 		</van-grid-item>
 	</van-grid>
 	<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>

pages/last/last.wxml

@@ -2,7 +2,7 @@
 	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
 			<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 wx:if='{{item.status == 0}}' class="isanswertag">未答题</view>

pages/lastdetail/lastdetail.js

@@ -189,8 +189,8 @@ Page({
     })
   },
   submitForm() {
-    let obj = this.data.chooseValue.find(item=>!item.currentAnswer)
-    if(!obj){
+    let obj = this.data.chooseValue.find(item => !item.currentAnswer)
+    if (!obj) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/paper/commit',
         method: "post",
@@ -205,9 +205,12 @@ Page({
               showCancel: false,
               content: '提交成功啦',
               success() {
-                wx.navigateTo({
-                  url: '/pages/last/last',
+                wx.switchTab({
+                  url: '/pages/personInfo/personInfo',
                 })
+                // wx.navigateTo({
+                //   url: '/pages/last/last',
+                // })
               }
             })
           } else {
@@ -239,15 +242,14 @@ Page({
           // }
         }
       })
-    }else{
+    } else {
       wx.showModal({
         showCancel: false,
-        content: '333333',
-        success() {
-        }
+        content: '请补全提交信息哦',
+        success() {}
       })
     }
-   
+
   },
   formSubmit(e) {
     let arr1 = this.data.zaizhiTime.filter(d => d);
@@ -293,6 +295,10 @@ Page({
 
   },
   async onLoad(options) {
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     this.setData({
@@ -308,6 +314,7 @@ Page({
         answersId: wx.getStorageSync('answersId' + wx.getStorageSync('answersId')),
         chooseValue: wx.getStorageSync('chooseValue' + wx.getStorageSync('answersId')),
       })
+      wx.hideLoading();
     } else {
       this.allShi(this.data.id, this.data.paperId, this.data.sessionKey);
     }
@@ -353,8 +360,12 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
+        wx.hideLoading();
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
+      },
+      fail:()=>{
+        wx.hideLoading();
       }
     })
   },

pages/lastdetail/lastdetail.wxml

@@ -72,6 +72,6 @@
 			</view>
 		</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

@@ -2,6 +2,7 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
+    isRz: false,
     showMore: false, //更多
     showzs: false, //证书显示
     show: false, //协议显示
@@ -32,23 +33,28 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0 && (res.data.data !== null || res.data.data !== "")) {
+          this.setData({
+            isRz: false
+          })
           this.isClass(sessionKey)
         } else {
-          wx.showModal({
-            content: "您还没有进行身份认证哦",
-            showCancel: false,
-            success(res) {
-              if (res.confirm) {
-                wx.redirectTo({
-                  url: '../Identity/Identity'
-                })
-              }
-            }
+          this.setData({
+            isRz: true
           })
         }
       }
     })
   },
+  escRz() {
+    wx.switchTab({
+      url: '/pages/index/index',
+    })
+  },
+  goRz() {
+    wx.navigateTo({
+      url: '/pages/Identity/Identity',
+    })
+  },
   // 查询我是否有班&&班级名字
   isClass(sessionKey) {
     wx.request({
@@ -372,12 +378,12 @@ Page({
             url: '../zbDetails/zbDetails?id=' + id
           })
         } else if (e.currentTarget.dataset.item.isActive == -1) {
-          if(courseUrl==null||courseUrl==""){
+          if (courseUrl == null || courseUrl == "") {
             wx.showModal({
               showCancel: false,
               content: "直播回放还未上传噢"
             })
-          }else{
+          } else {
             wx.navigateTo({
               url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
             })
@@ -424,12 +430,12 @@ Page({
             url: '../zbDetails/zbDetails?id=' + id
           })
         } else if (e.currentTarget.dataset.item.isActive == -1) {
-          if(courseUrl==null||courseUrl==""){
+          if (courseUrl == null || courseUrl == "") {
             wx.showModal({
               showCancel: false,
               content: "直播回放还未上传噢"
             })
-          }else{
+          } else {
             wx.navigateTo({
               url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
             })
@@ -472,9 +478,15 @@ Page({
   },
   // 去考试
   gokhAnswer(e) {
+    wx.showLoading({
+      mask: true,
+      title: '加载中',
+    })
     if (this.data.classInfo.id == -1) {
       this.examination(e.currentTarget.dataset.item.id);
+      wx.hideLoading();
     } else {
+      wx.hideLoading();
       if (!this.data.istask) {
         wx.showModal({
           showCancel: false,
@@ -526,6 +538,7 @@ Page({
               content: '老师还未出考试题哦'
             })
           } else {
+            console.log(res, '1111')
             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, 'answerAfterclass');
@@ -608,6 +621,7 @@ 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',
@@ -616,7 +630,7 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
         },
         success: (res) => {
-          if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
+          if (res.data.list[0] && res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
             })
@@ -980,6 +994,10 @@ Page({
     })
   },
   async onShow() {
+    // wx.showLoading({
+    //   title: '加载中',
+    //   mask:true
+    // })
     const sessionKey = await tools.checkSessionAndLogin();
     this.setData({
       sessionKey

pages/myClass/myClass.wxml

@@ -88,6 +88,18 @@
 			<view class="thinking" bindtap="moreThink">我再想想</view>
 		</view>
 	</van-popup>
+	<view wx:if="{{isRz}}" class="rzbj" catchtouchmove='true'>
+		<view class="rzbox">
+			<view class="tip">提示</view>
+			<view class="tip1">
+				您还没有进行身份认证哦!
+			</view>
+			<view class="sure_box">
+				<view class="qx" catchtap="escRz">取消</view>
+				<view class="sure" catchtap="goRz">确定</view>
+			</view>
+		</view>
+	</view>
 	<view class="notice" bindtap="gomyNotice">
 		<van-row>
 			<van-col span="2">
@@ -98,7 +110,8 @@
 		</van-row>
 	</view>
 	<van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
-		<image src='{{classInfo.logoImg}}' mode='aspectFill' class="banjihz" wx:if="{{classInfo.logoImg}}"></image><text>{{classInfo.clasName}}</text>
+		<image src='{{classInfo.logoImg}}' mode='aspectFill' class="banjihz" wx:if="{{classInfo.logoImg}}"></image>
+		<view style="max-width:500rpx;">{{classInfo.clasName}}</view>
 	</van-divider>
 	<view class="layout" bindtap="goWrite">
 		<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
@@ -127,8 +140,8 @@
 				<view class="name">{{item.courseName}}</view>
 				<view>
 					<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
-					<image src='/images/dtxs.png' wx:if='{{item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
-					<image src='/images/ckcj.png' wx:if='{{item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
+					<image src='/images/dtxs.png' wx:if='{{item.isNeedExam==1&&item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
+					<image src='/images/ckcj.png' wx:if='{{item.isNeedExam==1&&item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
 					<image src='/images/pjkc.png' wx:if='{{item.isFeedback==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
 					<image src='/images/ckpj.png' wx:if='{{item.isFeedback==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockpj"></image>
 				</view>
@@ -152,7 +165,7 @@
 		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">综合反馈表</view>
 		<view class="layout_text2" wx:if='{{istask4}}'>查看详情</view>
-		<view class="layout_text2" wx:else>去填写</view>
+		<view class="layout_text2" wx:if='{{!istask4}}'>去填写</view>
 	</view>
 	<view class="qy_title" bindtap="goMyPoints">
 		<view class="redk"></view>我的积分：0积分

pages/myClass/myClass.wxss

@@ -14,6 +14,69 @@
   margin-bottom: 30rpx;
 }
 
+.rzbj {
+  width: 750rpx;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.4);
+  position: fixed;
+  top: 0;
+  z-index: 99;
+}
+
+.rzbox {
+  background-color: #fff;
+  width: 600rpx;
+  height: 320rpx;
+  position: fixed;
+  top: 400rpx;
+  left: 75rpx;
+  border-radius: 20rpx;
+}
+
+.tip {
+  color: #333333;
+  text-align: center;
+  margin-top: 30rpx;
+  font-weight: 900;
+}
+
+.tip1 {
+  text-align: center;
+  margin-top: 40rpx;
+  font-weight: 900;
+  font-size: 30rpx;
+  color: #626367;
+}
+
+.sure_box {
+  width: 350rpx;
+  height: 60rpx;
+  margin-left: 125rpx;
+  margin-top: 50rpx;
+  /* border: 1px solid red; */
+}
+
+.qx {
+  border: 1px solid #eb3f33;
+  width: 150rpx;
+  height: 50rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  color: #eb3f33;
+  float: left;
+  line-height: 50rpx;
+}
+.sure {
+  border: 1px solid #eb3f33;
+  background-color: #eb3f33;
+  width: 150rpx;
+  height: 50rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  color: #fff;
+  float: right;
+  line-height: 50rpx;
+}
 .introuduce {
   background-color: #fff7e7;
   height: 70rpx;
@@ -24,8 +87,9 @@
   display: flex;
   line-height: 70rpx;
   font-size: 25rpx;
-  
+
 }
+
 .banjihz {
   width: 57rpx;
   height: 57rpx;
@@ -43,17 +107,21 @@
   /* border: 1px solid red; */
   overflow-y: auto;
 }
-.dl{
+
+.dl {
   text-indent: 56rpx;
 }
-.ewm{
+
+.ewm {
   width: 300rpx;
   height: 300rpx;
   margin-left: 160rpx;
 }
-.ermname{
+
+.ermname {
   margin-left: 50rpx;
 }
+
 /* .cloudimg{
   width: 733rpx;
   height: 220rpx; 

pages/myInteractions/myInteractions.js

@@ -124,6 +124,7 @@ Page({
         sessionKey: sessionKey
       },
       success: (res) => {
+        console.log(res,"00000000000")
         if (res.data.code == 0) {
           wx.hideLoading()
           wx.showModal({
@@ -141,7 +142,7 @@ Page({
           wx.hideLoading()
           wx.showModal({
             showCancel: false,
-            content: "提交失败了哦"
+            content: res.data.msg
           })
         }
       }

pages/myMission/myMission.js

@@ -2,6 +2,7 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
+    isRz: false,
     showewm: false, //是否显示班级群二维码
     showzs: false, //是否显示毕业证书
     show: false, //协议显示
@@ -113,7 +114,7 @@ Page({
         })
       },
       fail: (res) => {
-        console.log(res,"我下载失败了")
+        console.log(res, "我下载失败了")
         wx.hideLoading()
         wx.showModal({
           title: '提示',
@@ -170,22 +171,38 @@ Page({
       success: (res) => {
         if (res.data.code == 0 && (res.data.data !== null || res.data.data !== "")) {
           this.isClass(sessionKey)
+          this.setData({
+            isRz: false
+          })
         } else {
-          wx.showModal({
-            content: "您还没有进行身份认证哦",
-            showCancel: false,
-            success(res) {
-              if (res.confirm) {
-                wx.redirectTo({
-                  url: '../Identity/Identity'
-                })
-              }
-            }
+          this.setData({
+            isRz: true
           })
+          // wx.showModal({
+          //   content: "您还没有进行身份认证哦",
+          //   showCancel: false,
+          //   success(res) {
+          //     if (res.confirm) {
+          //       wx.redirectTo({
+          //         url: '../Identity/Identity'
+          //       })
+          //     }
+          //   }
+          // })
         }
       }
     })
   },
+  escRz() {
+    wx.switchTab({
+      url: '/pages/index/index',
+    })
+  },
+  goRz() {
+    wx.navigateTo({
+      url: '/pages/Identity/Identity',
+    })
+  },
   // 查询我是否有班&&班级名字
   isClass(sessionKey) {
     wx.request({
@@ -261,7 +278,7 @@ Page({
       }
     })
   },
-  moreThink(){
+  moreThink() {
     wx.switchTab({
       url: '../index/index'
     })
@@ -340,6 +357,10 @@ Page({
   },
   // 记录二维码已经点击
   showEwm() {
+    wx.showLoading({
+      title: '记载中',
+      mask: true
+    })
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/wxGroup',
       method: "post",
@@ -351,6 +372,10 @@ Page({
           showewm: true,
           istask1: true
         })
+        wx.hideLoading();
+      },
+      fail: () => {
+        wx.hideLoading();
       }
     })
   },
@@ -393,16 +418,31 @@ Page({
         wx.navigateTo({
           url: '../zbDetails/zbDetails?id=' + id
         })
-      }else if (e.currentTarget.dataset.item.isActive == -1) {
-        wx.navigateTo({
-          url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
-        })
-      } else {
+      }
+      //  else if (e.currentTarget.dataset.item.isActive == -1) {
+      //   wx.navigateTo({
+      //     url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
+      //   })
+      // } 
+      else if (e.currentTarget.dataset.item.isActive == -1) {
+        if(courseUrl==null||courseUrl==""){
+          wx.showModal({
+            showCancel: false,
+            content: "直播回放还未上传噢"
+          })
+        }else{
+          wx.navigateTo({
+            url: '../livePlayback/livePlayback?courseName=' + courseName + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo
+          })
+        }
+      }else {
         wx.showModal({
           showCancel: false,
           content: "直播还未开始哦"
         })
         return false;
+
+
       }
     } else {
       if (this.data.currentId != null) {
@@ -765,7 +805,7 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
         },
         success: (res) => {
-          if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
+          if (res.data.list[0] &&res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
             })

pages/myMission/myMission.wxml

@@ -88,6 +88,18 @@
 			<view class="thinking" bindtap="moreThink">我再想想</view>
 		</view>
 	</van-popup>
+		<view wx:if="{{isRz}}" class="rzbj" catchtouchmove='true'>
+		<view class="rzbox">
+			<view class="tip">提示</view>
+			<view class="tip1">
+				您还没有进行身份认证哦!
+			</view>
+			<view class="sure_box">
+				<view class="qx" catchtap="escRz">取消</view>
+				<view class="sure" catchtap="goRz">确定</view>
+			</view>
+		</view>
+	</view>
 	<view class="step" style="margin-top:20rpx">
 		<image src='{{istask1==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="whitebj">
@@ -132,8 +144,8 @@
 					</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' wx:if='{{item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
-					<image src='/images/ckcj.png' wx:if='{{item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
+					<image src='/images/dtxs.png' wx:if='{{item.isNeedExam==1&&item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
+					<image src='/images/ckcj.png' wx:if='{{item.isNeedExam==1&&item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
 					<image src='/images/pjkc.png' wx:if='{{item.isFeedback==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
 					<image src='/images/ckpj.png' wx:if='{{item.isFeedback==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockpj"></image>
 				</view>

pages/myMission/myMission.wxss

@@ -14,6 +14,71 @@
   margin-bottom: 30rpx;
 }
 
+.rzbj {
+  width: 750rpx;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.4);
+  position: fixed;
+  top: 0;
+  z-index: 99;
+}
+
+.rzbox {
+  background-color: #fff;
+  width: 600rpx;
+  height: 320rpx;
+  position: fixed;
+  top: 400rpx;
+  left: 75rpx;
+  border-radius: 20rpx;
+}
+
+.tip {
+  color: #333333;
+  text-align: center;
+  margin-top: 30rpx;
+  font-weight: 900;
+}
+
+.tip1 {
+  text-align: center;
+  margin-top: 40rpx;
+  font-weight: 900;
+  font-size: 30rpx;
+  color: #626367;
+}
+
+.sure_box {
+  width: 350rpx;
+  height: 60rpx;
+  margin-left: 125rpx;
+  margin-top: 50rpx;
+  /* border: 1px solid red; */
+}
+
+.qx {
+  border: 1px solid #eb3f33;
+  width: 150rpx;
+  height: 50rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  color: #eb3f33;
+  float: left;
+  line-height: 50rpx;
+}
+
+.sure {
+  border: 1px solid #eb3f33;
+  background-color: #eb3f33;
+  width: 150rpx;
+  height: 50rpx;
+  text-align: center;
+  border-radius: 10rpx;
+  color: #fff;
+  float: right;
+  line-height: 50rpx;
+}
+
 .introuduce {
   background-color: #fff7e7;
   height: 70rpx;
@@ -24,8 +89,9 @@
   display: flex;
   line-height: 70rpx;
   font-size: 25rpx;
-  
+
 }
+
 .banjihz {
   width: 57rpx;
   height: 57rpx;
@@ -43,17 +109,21 @@
   /* border: 1px solid red; */
   overflow-y: auto;
 }
-.dl{
+
+.dl {
   text-indent: 56rpx;
 }
-.ewm{
+
+.ewm {
   width: 300rpx;
   height: 300rpx;
   margin-left: 160rpx;
 }
-.ermname{
+
+.ermname {
   margin-left: 50rpx;
 }
+
 .agree_text {
   color: #000;
   margin-left: 120rpx;
@@ -79,6 +149,7 @@
   font-size: 24rpx;
   margin-top: 30rpx;
 }
+
 .step {
   width: 690rpx;
   margin-left: 50rpx;
@@ -112,7 +183,6 @@
   top: 30rpx;
   right: 30rpx;
 }
-
 .bjewm {
   width: 363rpx;
   height: 360rpx;
@@ -120,22 +190,20 @@
   top: 340rpx;
   left: 140rpx;
 }
-
 .bjq_text {
   font-size: 30rpx;
   font-weight: 900;
   position: absolute;
-  top: 90rpx;
+  top: 130rpx;
   left: 200rpx;
   padding-right: 40rpx
 }
-
 .sm_text {
   font-size: 28rpx;
   color: #999999;
   font-weight: 900;
   position: absolute;
-  top: 170rpx;
+  top: 80rpx;
   left: 200rpx;
 }
 

pages/myTraining/myTraining.wxss

@@ -17,22 +17,28 @@
 
 .sctext {
   float: right;
-  /* height: 141rpx; */
   width: 510rpx;
   margin-top: 30rpx;
   margin-left: 20rpx;
-  /* border: 1px solid red;   */
 }
 
 .t1 {
   color: #eb3f33;
   font-size: 25rpx;
   font-weight: 700;
+  width: 460rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 .t2 {
   color: #999999;
   font-size: 24rpx;
   margin-top: 10rpx;
+  width: 460rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
   /* padding-bottom: 50rpx; */
 }
 .t3 {
@@ -40,6 +46,10 @@
   font-size: 24rpx;
   margin-top: 10rpx;
   padding-bottom: 20rpx;
+  width: 460rpx;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
   /* padding-bottom: 50rpx; */
 }
 

pages/personInfo/personInfo.js

@@ -2,7 +2,7 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
-    isRz: true,
+    isRz: false,
     dataArr: [{
         img: "/images/person1.png",
         name: "我的培训",
@@ -109,6 +109,10 @@ Page({
             this.setData({
               isRz: false
             })
+          }else{
+            this.setData({
+              isRz: true
+            })
           }
         }
       }

pages/pyip/pyip.js

@@ -73,6 +73,7 @@ Page({
           if (credentials) {
             stsCache = result.data.credential
           } else {
+            wx.hideLoading();
             wx.showModal({
               title: '临时密钥获取失败',
               content: JSON.stringify(data),
@@ -82,6 +83,7 @@ Page({
           callback(stsCache && stsCache.credentials);
         },
         error: function (err) {
+          wx.hideLoading();
           wx.showModal({
             title: '临时密钥获取失败',
             content: JSON.stringify(err),
@@ -138,7 +140,7 @@ Page({
               },
               success: (res) => {
                 if (res.data.code == 0) {
-                  console.log(res, "我把照片路径传到服务器啦")
+                  wx.hideLoading();
                   wx.showModal({
                     title: '上传成功',
                     showCancel: false
@@ -151,14 +153,16 @@ Page({
                   })
                   this.getArr(this.data.sessionKey)
                 } else {
+                  wx.hideLoading();
                   wx.showModal({
-                    title: "上传失败啦",
+                    title: res.data.msg,
                     showCancel: false
                   });
                 }
               }
             });
           } else {
+            wx.hideLoading();
             wx.showModal({
               title: '上传失败',
               showCancel: false
@@ -175,9 +179,6 @@ Page({
       });
       requestTask.onProgressUpdate(function (res) {
         console.log('进度:', res);
-        if (res.progress == 100) {
-          wx.hideLoading();
-        }
       });
     });
   },
@@ -195,6 +196,16 @@ Page({
           imgList: res.data.imgList,
           videoList: res.data.videoList
         })
+        if (res.data.imgList && res.data.imgList.length != 0) {
+          this.setData({
+            isPhoto: true
+          })
+        }
+        if (res.data.videoList && res.data.videoList.length != 0) {
+          this.setData({
+            isVideo: true
+          })
+        }
       }
     })
   },

pages/pyip/pyip.wxml

@@ -7,20 +7,20 @@
 		<van-button type="primary" block color="#eb3f33" custom-style="width:614rpx;border-radius:10rpx;margin-top:20rpx;" bindtap="submitImgToTxy">提交</van-button>
 		<van-button type="primary" block color="#eb3f33" custom-style="width:614rpx;border-radius:10rpx;margin-top:20rpx;" bindtap="openCamera">重新拍摄</van-button>
 	</view>
-	<view class="pyp_box2" wx:if="{{imgList.length!= 0}}">
+	<view class="pyp_box2" wx:if="{{isPhoto}}">
 		<view class="add_text">历史上传照片</view>
 		<view style="display:flex;flex-wrap:wrap">
-		<view wx:for="{{imgList}}" wx:for-item="item">
-			<image src="{{item.filePath}}" class="slt"></image>
-		</view>
+			<view wx:for="{{imgList}}" wx:for-item="item">
+				<image src="{{item.filePath}}" class="slt"></image>
+			</view>
 		</view>
 	</view>
-		<view class="pyp_box2" style="margin-bottom:50rpx" wx:if="{{videoList.length!= 0}}">
+	<view class="pyp_box2" style="margin-bottom:50rpx" wx:if="{{isVideo}}">
 		<view class="add_text">历史上传视频</view>
 		<view style="display:flex;flex-wrap:wrap">
-		<view wx:for="{{videoList}}" wx:for-item="item">
-			<video src="{{item.filePath}}" show-center-play-btn='{{false}}' show-play-btn="{{true}}" controls class="xj"></video>
-		</view>
+			<view wx:for="{{videoList}}" wx:for-item="item">
+				<video src="{{item.filePath}}" show-center-play-btn='{{false}}' show-play-btn="{{true}}" controls class="xj"></video>
+			</view>
 		</view>
 	</view>
 </view>

pages/startClass/startClass.wxml

@@ -3,8 +3,8 @@
 		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
-			<view class="t2">主办：{{item.remark}}</view>
-			<view class="t2">承办：{{item.organizer}}</view>
+			<view class="t2" wx:if="{{item.remark!=null}}">主办：{{item.remark}}</view>
+			<view class="t2" wx:if="{{item.organizer!=null}}">承办：{{item.organizer}}</view>
 			<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
 		</view>
 	</view>

pages/studentList/studentList.wxss

@@ -13,10 +13,14 @@
 .text2{
   text-align: center;
   font-size: 28rpx;
-  line-height: 90rpx;
+  /* line-height: 90rpx; */
   display: block;
   width: 700rpx;
   margin-left: 25rpx;
   border-bottom: 1px solid #cccccc;
   color: #666666;
+}
+.text2 .van-col{
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }

pages/studentRegistration/studentRegistration.js

@@ -2,6 +2,8 @@ const tools = require('../../utils/tools.js');
 const app = require('../../utils/util.js');
 Page({
   data: {
+    jobArr: [],
+    jobtext: '请选择',
     kaihutext: '请选择',
     kaihuList: [{
         name: '高中'
@@ -65,7 +67,13 @@ Page({
       radio: event.detail,
     });
   },
-
+  jobChange(e) {
+    console.log(e)
+    this.setData({
+      jobIndex: e.detail.value,
+      jobtext: this.data.jobArr[e.detail.value].dictLabel
+    })
+  },
   share() {
     this.setData({
       show: true
@@ -96,7 +104,7 @@ Page({
     date = new Date(date);
     return `${date.getFullYear()-1}/${date.getMonth() + 1}/${date.getDate()}`;
   },
-  kaihuListChange (e) {
+  kaihuListChange(e) {
     console.log(e, "8888888888888")
     this.setData({
       kaihuindex: e.detail.value,
@@ -133,7 +141,7 @@ Page({
       peixunText: ''
     });
   },
-  parameterTap: function (e) { //e是获取e.currentTarget.dataset.id所以是必备的，跟前端的data-id获取的方式差不多
+  parameterTap: function (e) {
     let that = this
     let this_checked = e.currentTarget.dataset.id
     let parameterList = this.data.parameter //获取Json数组
@@ -148,7 +156,6 @@ Page({
       parameter: parameterList
     })
   },
-
   formSubmit(e) {
     if (!e.detail.value.username) {
       this.setData({
@@ -250,13 +257,14 @@ Page({
         peixunshijianTrue: false
       })
     }
-    console.log(this.data.kaihuList,this.data.kaihuindex,"000000")
+    console.log(this.data.jobArr,this.data.jobIndex, "55555555")
     e.detail.value.culture = this.data.kaihuList[this.data.kaihuindex].name;
+    e.detail.value.studentDuty = this.data.jobtext;
     e.detail.value.tenure = this.data.tenure;
     e.detail.value.sessionKey = this.data.sessionKey;
     let aa = e.detail.value
     console.log(aa, "00000000")
-    if (aa.culture && aa.mcajor && aa.school && aa.studentDuty && aa.tenure && aa.studentDept) {
+    if (aa.culture && aa.school && aa.studentDuty && aa.tenure && aa.studentDept) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/student/upStudent',
         method: "post",
@@ -271,7 +279,6 @@ Page({
           mcajor: aa.mcajor,
         },
         success: () => {
-          console.log("提交成功");
           wx.showModal({
             showCancel: false,
             content: '报到成功',
@@ -298,18 +305,10 @@ Page({
     } else {
       wx.showModal({
         showCancel: false,
-        content: '请补全信息',
-        success() {
-
-        }
+        content: '请补全除了“所学专业”以外的其他信息'
       })
     }
-
-
-
-
   },
-
   timeFormat(date, fmt) {
     let o = {
       "M+": date.getMonth() + 1, //月份   
@@ -328,6 +327,27 @@ Page({
     return fmt;
 
   },
+  getjob(sessionKey) {
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/position',
+      method: "get",
+      data: {
+        sessionKey
+      },
+      success: (res) => {
+        let Arr=[];
+        res.data.data.forEach(item => {
+          let newdata = {};
+          newdata.dictLabel = item.dictLabel;
+          Arr.push(newdata);
+        });
+        this.setData({
+          jobArr:Arr
+        })
+        console.log(this.data.jobArr,'我是新组成的数组')
+      }
+    })
+  },
   onReady: function () {},
   async onLoad() {
     const sessionKey = await tools.checkSessionAndLogin();
@@ -336,6 +356,7 @@ Page({
       sessionKey: sessionKey
     })
     this.getBanner(sessionKey);
+    this.getjob(sessionKey)
   },
   getBanner(sessionKey) {
     wx.request({
@@ -345,7 +366,7 @@ Page({
         sessionKey: sessionKey,
       },
       success: (res) => {
-        console.log(res)
+        console.log(res.data.data.studentDuty)
         if (res.data.code == 0) {
           this.data.parameter.forEach(item => {
             if (item.value == res.data.data.studentSex) {
@@ -356,7 +377,7 @@ Page({
             info: res.data.data,
             parameter: this.data.parameter,
             studentDept: res.data.data.studentDept,
-            studentDuty: res.data.data.studentDuty,
+            jobtext: res.data.data.studentDuty,
             kaihutext: res.data.data.culture,
             major: res.data.data.major,
             tenure: res.data.data.tenure,
@@ -365,5 +386,5 @@ Page({
         }
       }
     })
-  },
+  }
 })

pages/studentRegistration/studentRegistration.wxml

@@ -29,22 +29,14 @@
 				<input class="" name="studentDept" value="{{ studentDept }}" placeholder="请输入工作单位" placeholder-style="font-size:25rpx" />
 			</view>
 		</view>
-
 		<view class='fwb'>
 			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
 			<view class="xingbie">文化程度</view>
-			<!-- <picker bindchange="kaihuListChange" name="culture" value="{{kaihuList[kaihuindex].name}}" range-key="{{'name'}}" range="{{kaihuList}}" disabled="{{flag}}">
-				<view class="weui-input aaa">
-					{{kaihuList[kaihuindex].name}} 
-					<text >{{kaihutext == null? '请选择':''}}</text>
-				</view>
-			</picker> -->
-			<picker bindchange="kaihuListChange" ame="culture" value="{{kaihuindex}}" range-key="{{'name'}}" range="{{kaihuList}}">
+			<picker bindchange="kaihuListChange" name="culture" value="{{kaihuindex}}" range-key="{{'name'}}" range="{{kaihuList}}">
 				<view class="weui-input aaa">
 					{{kaihutext == null? '请选择':kaihutext}}
-					<!-- {{kaihuList[kaihuindex].name}} -->
 				</view>
 			</picker>
 		</view>
@@ -72,7 +64,12 @@
 			</view>
 			<view class="xingbie">现任职务</view>
 			<view class='weui-input'>
-				<input class="" disabled name="studentDuty" value="{{ studentDuty }}" placeholder="请输入现任职务" placeholder-style="font-size:25rpx" />
+				<picker bindchange="jobChange" range-key="{{'dictLabel'}}" name="studentDuty" value="{{jobIndex}}" range="{{jobArr}}">
+				<view class="weui-input aaa">
+					{{jobtext == null?'请选择':jobtext}}
+				</view>
+			</picker>
+				<!-- <input class="" disabled name="studentDuty" value="{{ studentDuty }}" placeholder="请输入现任职务" placeholder-style="font-size:25rpx" /> -->
 			</view>
 		</view>
 		<view class='fwb'>
@@ -80,7 +77,7 @@
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx;"> </image>
 			</view>
 			<view class="xingbie">任职时间</view>
-			<view class='weui-input' style="font-size: 26rpx;  line-height: 56rpx;" catchtap="share1">
+			<view class='weui-input aaa' style="font-size: 26rpx;  line-height: 56rpx;" catchtap="share1">
 				{{tenure == null ? '':tenure  }}
 				<view wx:if='{{!tenure}}' style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx">{{headmasterText}}</view>
 			</view>
@@ -98,7 +95,7 @@
 			</view>
 		</view>
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
-			<van-button round formType="submit">提交表单</van-button>
+			<van-button round formType="submit">提交报到信息</van-button>
 		</view>
 	</form>
 </view>

pages/studentRegistration/studentRegistration.wxss

@@ -85,12 +85,14 @@ button:not([size='mini']) {
 }
 
 .weui-input {
-  margin-left: 20rpx;
+  /* padding-left: 20rpx; */
+  /* margin-left: 20rpx; */
   background: #F4F4F4;
   width: 474rpx;
   height: 60rpx;
 }
 .weui-input input{
+  margin-left: 20rpx;
   height: 60rpx;
 }
 .van-icon-circle {
@@ -128,4 +130,6 @@ radio {
 .aaa{
   color: black;
   line-height: 60rpx;
+  padding-left: 20rpx;
+  width: 454rpx;
 }

pages/zbDetails/zbDetails.js

@@ -2,6 +2,7 @@ const tools = require('../../utils/tools.js');
 const getusersig = require('../../utils/getUserSig.js');
 const TIM = require('../../utils/tim-wx.js');
 const COS = require('../../utils/cos-wx-v5.js');
+const util = require('../../utils/util.js');
 Page({
   data: {
     rtcConfig: {
@@ -105,22 +106,37 @@ Page({
     },
     onSdkRecived: function (event) {
       let _this = this;
-      console.log(event.data[0].payload.data,"我收到消息了")
+      console.log(event.data[0], "我收到消息了")
       if (event.data[0].conversationType == "GROUP" && event.data[0].to == _this.data.currentGroup.groupID) {
         console.log("我找到这个会话了", _this.data.chatContent)
+        let currentTime = util.formatTime(new Date());
         if (_this.data.chatContent.length > 0) { // 表示不是第一次填数据，可以使用push
           console.log("表示不是第一次填数据，可以使用push", _this.data.chatContent)
           const chatContent = _this.data.chatContent
+          event.data[0].currentTime=currentTime;
           chatContent.push(event.data[0])
+          // chatContent.push({
+          //   currentTime: currentTime
+          // })
+          console.log(chatContent, "我是收到消息的数组")
           _this.setData({
             chatContent: chatContent,
             bottom: 'scrollBottom'
+            // currentTime: currentTime
           })
         } else { // 表示第一次填数据
+          // let currentTime = util.formatTime(new Date());
           console.log("表示第一次填数据", _this.data.chatContent)
+          // const chatContent = _this.data.chatContent
+          let Arr = [];
+          event.data.currentTime = currentTime
+          Arr.push(event.data)
+          console.log(event.data)
+          // Arr.push({currentTime:currentTime})
           _this.setData({
-            chatContent: event.data,
+            chatContent: Arr,
             bottom: 'scrollBottom'
+            // currentTime: currentTime
           })
         }
       }
@@ -316,6 +332,8 @@ Page({
       let promise = this.data.tim.sendMessage(message);
       promise.then((imResponse) => {
         console.log(imResponse, "发送成功");
+        let currentTime = util.formatTime(new Date());
+        console.log(currentTime, "00000")
         if (this.data.chatContent.length > 0) { // 表示不是第一次填数据，可以使用push
           console.log("表示不是第一次填数据，可以使用push", this.data.chatContent)
           const chatContent = this.data.chatContent
@@ -323,8 +341,10 @@ Page({
             nick: this.data.miniName,
             payload: {
               text: this.data.inputValue
-            }
+            },
+            currentTime: currentTime
           })
+          console.log(chatContent, "11111")
           this.setData({
             chatContent: chatContent,
             bottom: 'scrollBottom'
@@ -336,10 +356,12 @@ Page({
               nick: this.data.miniName,
               payload: {
                 text: this.data.inputValue
-              }
+              },
+              currentTime: currentTime
             }],
             bottom: 'scrollBottom'
           })
+          console.log(this.data.chatContent, "2222")
         }
         this.setData({
           inputValue: ''

pages/zbDetails/zbDetails.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText":"在线直播",
+  "disableSwipeBack":true,
   "usingComponents": {
     "trtc-room": "../../components/trtc-room/trtc-room"
   }

pages/zbDetails/zbDetails.wxml

@@ -6,7 +6,10 @@
 				<scroll-view scroll-y="true" style="height: 490rpx;width:690rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">
 					<view style="padding:30rpx">
 						<view wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
-							<text>{{item.nick}}:</text>{{item.payload.text}}
+							 <view style="color:rgba(102,102,102);font-size:25rpx">{{item.currentTime}}</view>
+							<text style="color：#eb3f33">{{item.nick}} : </text>{{item.payload.text}}
+							<!-- <text style="color：#eb3f33;">{{item.nick}}:</text>{{item.payload.text}} -->
+							<!--    <text style="color：#eb3f33;"> {{item.nick}} : </text> <text style="font-weight:500;"> {{item.payload.text}} </text> -->
 						</view>
 					</view>
 					<view id="scrollBottom" style="height:10rpx"></view>

pages/zbDetails/zbDetails.wxss

@@ -8,7 +8,8 @@ page {
 .area {
   width: 700rpx;
   height: 600rpx;
-  background-color: rgba(0,0,0,0.1);
+  /* background-color: rgba(0,0,0,0.1); */
+  /* border:1px solid red; */
   position: absolute;
   top: 550rpx;
   left: 25rpx;
@@ -18,11 +19,14 @@ page {
 .chatbox {
   width: 700rpx;
   height: 500rpx;
-  border-radius: 20rpx;
+  /* border-radius: 20rpx; */
   overflow-y: auto;
   font-size: 25rpx;
   position: absolute;
   top:0rpx;
+  /* border: 1px solid red; */
+  border-top: 1px solid rgba(219,219,219);
+  border-bottom: 1px solid rgba(219,219,219); 
 }
 .puthands_box {
   width: 700rpx;

utils/util.js

@@ -3,8 +3,24 @@
   // publicUrl: 'https://sqpx.jiaxintech.com'//正式地址
   // publicUrl:'http://10.16.10.139'//ly
   // publicUrl:'http://10.16.4.19:80'//hyb
-  // publicUrl:'http://10.16.4.26:80'//zxq
+  //  publicUrl:'http://10.16.4.26:80'//zxq
 };
+
+const formatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+  return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
 module.exports = {
-  globalData: globalData
+  globalData: globalData,
+  formatTime: formatTime
 }