Browse Source

0804修改

ssfg 4 years ago
parent
commit
ddeaee5808
68 changed files with 935 additions and 1559 deletions
  1. 1 13
      app.js
  2. 4 3
      app.json
  3. 3 11
      components/trtc-room/template/1v1/1v1.wxml
  4. 0 1
      components/trtc-room/trtc-room.js
  5. BIN
      images/ewm.jpg
  6. 0 5
      pages/Identity/Identity.wxml
  7. 0 67
      pages/InteractiveQA/InteractiveQA.js
  8. 0 1
      pages/InteractiveQA/InteractiveQA.wxss
  9. 1 1
      pages/agoClass/agoClass.js
  10. 1 1
      pages/agoClass/agoClass.wxml
  11. 0 2
      pages/agoClass/agoClass.wxss
  12. 1 2
      pages/answerAfterclass/answerAfterclass.wxml
  13. 38 35
      pages/answerAfterclass/answerAfterclass.wxss
  14. 33 15
      pages/dbDetails/dbDetails.js
  15. 1 1
      pages/dbDetails/dbDetails.wxml
  16. 4 11
      pages/dbVideo/dbVideo.js
  17. 48 7
      pages/demandCourses/demandCourses.js
  18. 1 1
      pages/demandCourses/demandCourses.wxml
  19. 1 165
      pages/evaluationCourse/evaluationCourse.js
  20. 3 31
      pages/evaluationCourse/evaluationCourse.wxml
  21. 39 26
      pages/evaluationCourse/evaluationCourse.wxss
  22. 2 3
      pages/evaluationCourseDetail/evaluationCourseDetail.js
  23. 1 1
      pages/evaluationCourseDetail/evaluationCourseDetail.wxml
  24. 3 5
      pages/exhibitionList/exhibitionList.js
  25. 0 5
      pages/exhibitionList/exhibitionList.wxml
  26. 0 4
      pages/exhibitionList/exhibitionList.wxss
  27. 0 1
      pages/feedBack/feedBack.js
  28. 2 2
      pages/grade/grade.js
  29. 0 61
      pages/groupsList/groupsList.js
  30. 0 4
      pages/groupsList/groupsList.wxss
  31. 2 1
      pages/historyClass/historyClass.js
  32. 0 6
      pages/historyClass/historyClass.wxss
  33. 21 28
      pages/index/index.js
  34. 0 5
      pages/index/index.wxml
  35. 10 10
      pages/last/last.js
  36. 0 2
      pages/last/last.wxml
  37. 0 3
      pages/last/last.wxss
  38. 0 9
      pages/lastdetail/lastdetail.wxml
  39. 0 3
      pages/lastdetail/lastdetail.wxss
  40. 107 155
      pages/myClass/myClass.js
  41. 87 8
      pages/myClass/myClass.wxml
  42. 22 10
      pages/myClass/myClass.wxss
  43. 0 5
      pages/myInteractions/myInteractions.wxss
  44. 118 251
      pages/myMission/myMission.js
  45. 91 2
      pages/myMission/myMission.wxml
  46. 81 0
      pages/myMission/myMission.wxss
  47. 0 2
      pages/myNotice/myNotice.js
  48. 28 1
      pages/myPoints/myPoints.js
  49. 5 42
      pages/myPoints/myPoints.wxml
  50. 0 7
      pages/myPoints/myPoints.wxss
  51. 1 15
      pages/myTraining/myTraining.js
  52. 1 15
      pages/onlineClass/onlineClass.js
  53. 0 17
      pages/onlineClass/onlineClass.wxml
  54. 35 32
      pages/personInfo/personInfo.js
  55. 14 54
      pages/personInfo/personInfo.wxml
  56. 1 1
      pages/pyip/pyip.js
  57. 1 66
      pages/schoolIntrouce/schoolIntrouce.js
  58. 0 1
      pages/schoolIntrouce/schoolIntrouce.wxml
  59. 0 53
      pages/studentList/studentList.js
  60. 1 1
      pages/studentList/studentList.wxml
  61. 81 147
      pages/studentRegistration/studentRegistration.wxml
  62. 33 54
      pages/testAnswer/testAnswer.js
  63. 2 2
      pages/testAnswer/testAnswer.wxml
  64. 0 59
      pages/userGuide/userGuide.js
  65. 1 1
      pages/userGuide/userGuide.wxml
  66. 1 1
      pages/welcome/welcome.wxml
  67. 0 1
      pages/zbDetails/zbDetails.wxml
  68. 4 4
      utils/util.js

+ 1 - 13
app.js

@@ -1,17 +1,5 @@
 App({
 App({
   globalData: {
   globalData: {
     showAnimation: true
     showAnimation: true
-  },
-  onLaunch(options) {
-    // console.log(this.globalData.showAnimation)
-  },
-  onShow(options) {
-    // Do something when show.
-  },
-  onHide() {
-    // Do something when hide.
-  },
-  onError(msg) {
-    console.log(msg)
-  },
+  }
 })
 })

+ 4 - 3
app.json

@@ -1,11 +1,12 @@
 {
 {
   "pages": [
   "pages": [
     "pages/welcome/welcome",
     "pages/welcome/welcome",
+    "pages/myMission/myMission",
+    "pages/myClass/myClass",
+    "pages/studentList/studentList",
     "pages/pyip/pyip",
     "pages/pyip/pyip",
     "pages/userGuide/userGuide",
     "pages/userGuide/userGuide",
-    "pages/studentList/studentList",
     "pages/groupsList/groupsList",
     "pages/groupsList/groupsList",
-    "pages/myClass/myClass",
     "pages/schoolIntrouce/schoolIntrouce",
     "pages/schoolIntrouce/schoolIntrouce",
     "pages/testAnswer/testAnswer",
     "pages/testAnswer/testAnswer",
     "pages/InteractiveQA/InteractiveQA",
     "pages/InteractiveQA/InteractiveQA",
@@ -29,7 +30,7 @@
     "pages/dbVideo/dbVideo",
     "pages/dbVideo/dbVideo",
     "pages/myNotice/myNotice",
     "pages/myNotice/myNotice",
     "pages/myInteractions/myInteractions",
     "pages/myInteractions/myInteractions",
-    "pages/myMission/myMission",
+    
     "pages/exhibitionList/exhibitionList",
     "pages/exhibitionList/exhibitionList",
     "pages/startClass/startClass",
     "pages/startClass/startClass",
     "pages/myInteractionsDetais/myInteractionsDetais",
     "pages/myInteractionsDetais/myInteractionsDetais",

File diff suppressed because it is too large
+ 3 - 11
components/trtc-room/template/1v1/1v1.wxml


+ 0 - 1
components/trtc-room/trtc-room.js

@@ -2051,7 +2051,6 @@ Component({
     //                                  | $$
     //                                  | $$
     //                                   \$$
     //                                   \$$
     // 以下为 debug & template 相关函数
     // 以下为 debug & template 相关函数
-
     _toggleVideo() {
     _toggleVideo() {
       if (this.data.pusher.enableCamera) {
       if (this.data.pusher.enableCamera) {
         this.unpublishLocalVideo()
         this.unpublishLocalVideo()

BIN
images/ewm.jpg


+ 0 - 5
pages/Identity/Identity.wxml

@@ -7,12 +7,7 @@
 		<view class="form_item">
 		<view class="form_item">
 			<image src='/images/shenfen2.png' mode="aspectFit" class="icon1"></image>
 			<image src='/images/shenfen2.png' mode="aspectFit" class="icon1"></image>
 			<input style='display:inline-block;height:60%;' disabled="{{isInput2}}" placeholder-style='font-size:30rpx;' placeholder='请输入手机号' name='phone' type='number' value="{{phone}}"></input>
 			<input style='display:inline-block;height:60%;' disabled="{{isInput2}}" placeholder-style='font-size:30rpx;' placeholder='请输入手机号' name='phone' type='number' value="{{phone}}"></input>
-			<!-- <view class="getyzm">获取验证码</view> -->
 		</view>
 		</view>
-		<!-- <view class="form_item">
-			<image src='/images/shenfen3.png' mode="aspectFit" class="icon1"></image>
-			<input style='width:80%;display:inline-block;height:60%;' placeholder-style='font-size:30rpx;' placeholder='请输入验证码'></input>
-		</view> -->
 		<view class="form_item">
 		<view class="form_item">
 			<image src='/images/shenfen4.png' mode="aspectFit" class="icon1"></image>
 			<image src='/images/shenfen4.png' mode="aspectFit" class="icon1"></image>
 			<input style='width:80%;display:inline-block;height:60%;' disabled="{{isInput3}}" placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>
 			<input style='width:80%;display:inline-block;height:60%;' disabled="{{isInput3}}" placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>

+ 0 - 67
pages/InteractiveQA/InteractiveQA.js

@@ -1,20 +1,8 @@
-// pages/InteractiveQA/InteractiveQA.js
 Page({
 Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
   toPyip(){
   toPyip(){
     wx.navigateTo({
     wx.navigateTo({
       url: '../pyip/pyip'
       url: '../pyip/pyip'
     })
     })
-    // wx.showModal({
-    //   showCancel: false,
-    //   content: '当前功能暂未开放'
-    // })
   },
   },
   toWyiw(){
   toWyiw(){
     wx.navigateTo({
     wx.navigateTo({
@@ -25,60 +13,5 @@ Page({
     wx.navigateTo({
     wx.navigateTo({
       url: '/pages/exhibitionList/exhibitionList?id=2',
       url: '/pages/exhibitionList/exhibitionList?id=2',
     })
     })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
   }
 })
 })

+ 0 - 1
pages/InteractiveQA/InteractiveQA.wxss

@@ -1,4 +1,3 @@
-/* pages/InteractiveQA/InteractiveQA.wxss */
 page {
 page {
   background-color: #f2f2f2;
   background-color: #f2f2f2;
 }
 }

+ 1 - 1
pages/agoClass/agoClass.js

@@ -9,7 +9,7 @@ Page({
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey,
+        sessionKey,
         isActive: "2"
         isActive: "2"
       },
       },
       success: (res) => {
       success: (res) => {

+ 1 - 1
pages/agoClass/agoClass.wxml

@@ -1,5 +1,5 @@
 <view class="container">
 <view class="container">
-	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
 		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
 		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
 		<view class="sctext">
 		<view class="sctext">
 			<view class="t1">{{item.clasName}}</view>
 			<view class="t1">{{item.clasName}}</view>

+ 0 - 2
pages/agoClass/agoClass.wxss

@@ -6,7 +6,6 @@ page {
   width: 710rpx;
   width: 710rpx;
   margin-left: 20rpx;
   margin-left: 20rpx;
   height: 200rpx;
   height: 200rpx;
-  /* border: 1px solid red; */
   margin-top: 20rpx;
   margin-top: 20rpx;
   background-color: #fff;
   background-color: #fff;
   border-radius: 5rpx;
   border-radius: 5rpx;
@@ -27,7 +26,6 @@ page {
   height: 141rpx;
   height: 141rpx;
   width: 530rpx;
   width: 530rpx;
   margin-top: 30rpx;
   margin-top: 30rpx;
-  /* border: 1px solid red;   */
 }
 }
 
 
 .t1 {
 .t1 {

+ 1 - 2
pages/answerAfterclass/answerAfterclass.wxml

@@ -1,6 +1,6 @@
 <view class='home'>
 <view class='home'>
 	<view class="box">
 	<view class="box">
-		<view> 共<view class="ti">{{index+1}}</view>/{{questionList.length}}题</view>
+		<view>共<view class="ti">{{index+1}}</view>/{{questionList.length}}题</view>
 	</view>
 	</view>
 	<view class="question">
 	<view class="question">
 		{{questionList[index].QuestStem}}
 		{{questionList[index].QuestStem}}
@@ -42,7 +42,6 @@
 		<radio value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}
 		<radio value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}
 	</label>
 	</label>
 </radio-group>
 </radio-group>
-<!-- questionList[index].item.checked  -->
 <checkbox-group class="parameter-wrap" data-questTypes='{{questionList[index].QuestType}}' data-idx='{{questionList[index].id}}' bindchange="checkboxChange" wx:if="{{questionList[index].QuestType == 1}}">
 <checkbox-group class="parameter-wrap" data-questTypes='{{questionList[index].QuestType}}' data-idx='{{questionList[index].id}}' bindchange="checkboxChange" wx:if="{{questionList[index].QuestType == 1}}">
 	<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:key="{{item.value}}" wx:for="{{questionList[index].QuestChoice}}">
 	<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:key="{{item.value}}" wx:for="{{questionList[index].QuestChoice}}">
 		<checkbox value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}
 		<checkbox value="{{item.value}}" checked="{{item.checked}}" />{{item.name}}

+ 38 - 35
pages/answerAfterclass/answerAfterclass.wxss

@@ -36,9 +36,10 @@
   display: flex;
   display: flex;
   margin-top: -10rpx;
   margin-top: -10rpx;
 }
 }
-.parameter-wrap{
+
+.parameter-wrap {
   display: flex;
   display: flex;
-  flex-direction:column
+  flex-direction: column
 }
 }
 
 
 .parameter-info {
 .parameter-info {
@@ -46,50 +47,52 @@
   font-family: Source Han Sans CN;
   font-family: Source Han Sans CN;
   font-weight: 400;
   font-weight: 400;
   color: rgba(51, 51, 51, 1);
   color: rgba(51, 51, 51, 1);
-  border:1px solid rgba(235,63,51,1);
+  border: 1px solid rgba(235, 63, 51, 1);
   border-radius: 40rpx;
   border-radius: 40rpx;
   padding: 20rpx;
   padding: 20rpx;
   margin: 20rpx 50rpx;
   margin: 20rpx 50rpx;
 }
 }
+
 .checked_parameter {
 .checked_parameter {
   color: white;
   color: white;
   background: #EB3F33;
   background: #EB3F33;
 }
 }
+
 .van-button--default {
 .van-button--default {
-  background:linear-gradient(90deg,rgba(215,47,29,1),rgba(249,157,48,1)) !important;
-  color: white!important;
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
+  color: white !important;
 }
 }
+
 button:not([size='mini']) {
 button:not([size='mini']) {
-  /* margin: 40rpx 0 60rpx 60rpx !important; */
   width: 80% !important;
   width: 80% !important;
   margin-left: 10% !important;
   margin-left: 10% !important;
-  margin-top: 5% !important ;
-  }
-  /* .my-choosebox radio{
-    display: none
-  } */
-  .my-choosebox {
-    color: rgba(51, 51, 51, 1);
-    border: 1px solid rgba(235,63,51,1);
-    border-radius: 40rpx;
-    padding: 20rpx 50rpx;
-    margin: 15rpx 50rpx;
-  }
-  .checkboxbox{
-    background:#EB3F33;
-    color: white;
-  }
-  .parameter-wrap radio {
-    display: none;
-  }
-  .parameter-wrap checkbox {
-    display: none;
-  }
+  margin-top: 5% !important;
+}
+
+.my-choosebox {
+  color: rgba(51, 51, 51, 1);
+  border: 1px solid rgba(235, 63, 51, 1);
+  border-radius: 40rpx;
+  padding: 20rpx 50rpx;
+  margin: 15rpx 50rpx;
+}
+
+.checkboxbox {
+  background: #EB3F33;
+  color: white;
+}
+
+.parameter-wrap radio {
+  display: none;
+}
+
+.parameter-wrap checkbox {
+  display: none;
+}
 
 
-  textarea {
-    border: 1px solid rgba(217, 217, 217, 1);
-    margin: 0 auto;
-    height: 200rpx;
-    margin-top: 50rpx;
-  }
-  
+textarea {
+  border: 1px solid rgba(217, 217, 217, 1);
+  margin: 0 auto;
+  height: 200rpx;
+  margin-top: 50rpx;
+}

+ 33 - 15
pages/dbDetails/dbDetails.js

@@ -6,12 +6,11 @@ Page({
     title: '', //视频标题
     title: '', //视频标题
     message: '', //视频信息
     message: '', //视频信息
     playTimes: 0, //播放次数
     playTimes: 0, //播放次数
-    startPlayTime: 0, // 从这个时间点开始播放
+    playVideoDuration: 0, // 从这个时间点开始播放
     id: 0, //带过来的id
     id: 0, //带过来的id
-    studyLog: {}, //学习日志
+    studyLog: {}, //我得到的学习日志
     intervalTime: 0, //隔五分钟清空重新计时 弹出信息确认在不在
     intervalTime: 0, //隔五分钟清空重新计时 弹出信息确认在不在
     video_real_time: 0, //实时播放进度
     video_real_time: 0, //实时播放进度
-    initial_time: '', //视频跳转进度 秒
     intervalCtx: null,
     intervalCtx: null,
     videoContext: null
     videoContext: null
   },
   },
@@ -21,6 +20,7 @@ Page({
   },
   },
   // 计时 五分钟弹出一个弹框
   // 计时 五分钟弹出一个弹框
   calculateTime() {
   calculateTime() {
+    console.log(this.data.intervalTime)
     let _this = this;
     let _this = this;
     this.setData({
     this.setData({
       intervalTime: _this.data.intervalTime + 5
       intervalTime: _this.data.intervalTime + 5
@@ -43,9 +43,6 @@ Page({
   },
   },
   // 点击开始播放视频
   // 点击开始播放视频
   bindplay() {
   bindplay() {
-    this.setData({
-      videoContext: wx.createVideoContext('myVideo')
-    })
     this.setData({
     this.setData({
       intervalCtx: setInterval(() => {
       intervalCtx: setInterval(() => {
         this.calculateTime()
         this.calculateTime()
@@ -67,6 +64,7 @@ Page({
         courseId: _this.data.id
         courseId: _this.data.id
       },
       },
       success: (e) => {
       success: (e) => {
+        console.log(e, "888888888888888888")
         this.setData({
         this.setData({
           url: e.data.url,
           url: e.data.url,
           show: false,
           show: false,
@@ -95,7 +93,7 @@ Page({
         } else {
         } else {
           _this.setData({
           _this.setData({
             studyLog: e.data.studyLog,
             studyLog: e.data.studyLog,
-            startPlayTime: e.data.studyLog.studyTime
+            playVideoDuration: e.data.studyLog.studyTime
           })
           })
         }
         }
       }
       }
@@ -110,11 +108,13 @@ Page({
     this.setData({
     this.setData({
       [studyTime]: currentTime
       [studyTime]: currentTime
     })
     })
+    // _this.setData({
+    //   currentTime:currentTime
+    // })
     let aa = 1;
     let aa = 1;
     let jump_time;
     let jump_time;
-    // let duration = e.detail.duration
     if (_this.data.video_real_time == 0) {
     if (_this.data.video_real_time == 0) {
-      jump_time = parseInt(_this.data.startPlayTime) + parseInt(_this.data.video_real_time)
+      jump_time = parseInt(_this.data.playVideoDuration) + parseInt(_this.data.video_real_time)
     } else {
     } else {
       jump_time = parseInt(_this.data.video_real_time)
       jump_time = parseInt(_this.data.video_real_time)
     }
     }
@@ -147,14 +147,28 @@ Page({
         studyLog: _this.data.studyLog
         studyLog: _this.data.studyLog
       },
       },
       success: (e) => {
       success: (e) => {
-        console.log(e, "我修改进度成功了")
+        wx.showModal({
+          showCancel: false,
+          content: "该录播视频已经看完啦,快去完成其他任务吧!",
+          success(res) {
+            if (res.confirm) {
+              wx.navigateBack({
+                delta: 1
+              })
+            }
+          }
+        })
       }
       }
     })
     })
   },
   },
   onUnload() {
   onUnload() {
     let _this = this;
     let _this = this;
     clearInterval(_this.data.intervalCtx)
     clearInterval(_this.data.intervalCtx)
-    if (_this.data.startPlayTime < _this.data.studyLog.studyTime) {
+    let stydyrecord = _this.data.playVideoDuration;
+    if (stydyrecord == null) {
+      stydyrecord == 0
+    }
+    if (_this.data.studyLog.studyTime > stydyrecord) {
       wx.request({
       wx.request({
         method: "post",
         method: "post",
         url: app.globalData.publicUrl + '/wx/course/updateStudyLog',
         url: app.globalData.publicUrl + '/wx/course/updateStudyLog',
@@ -170,7 +184,11 @@ Page({
   onHide() {
   onHide() {
     let _this = this;
     let _this = this;
     clearInterval(_this.data.intervalCtx)
     clearInterval(_this.data.intervalCtx)
-    if (_this.data.studyTime < _this.data.studyLog.studyTime) {
+    let stydyrecord = _this.data.playVideoDuration;
+    if (stydyrecord == null) {
+      stydyrecord == 0
+    }
+    if (_this.data.studyLog.studyTime > _this.data.playVideoDuration) {
       wx.request({
       wx.request({
         method: "post",
         method: "post",
         url: app.globalData.publicUrl + '/wx/course/updateStudyLog',
         url: app.globalData.publicUrl + '/wx/course/updateStudyLog',
@@ -185,11 +203,11 @@ Page({
   },
   },
   async onLoad(options) {
   async onLoad(options) {
     this.setData({
     this.setData({
-      id: options.id
+      id: options.id,
+      videoContext: wx.createVideoContext('myVideo')
     })
     })
     const sessionKey = await tools.checkSessionAndLogin();
     const sessionKey = await tools.checkSessionAndLogin();
-    this.getdbArr(sessionKey);
     this.getStudyLog(sessionKey);
     this.getStudyLog(sessionKey);
+    this.getdbArr(sessionKey);
   }
   }
-
 })
 })

+ 1 - 1
pages/dbDetails/dbDetails.wxml

@@ -1,5 +1,5 @@
 <view class="home">
 <view class="home">
-	<video id="myVideo" bindplay="bindplay" bindpause="bindpause" enable-auto-rotation="true" src="{{url}}" initial-time="{{startPlayTime}}" binderror="videoErrorCallback" bindtimeupdate="timeUpdate" show-play-btn="ture" show-mute-btn="true" controls bindended="chechEndStatus">
+	<video src="{{url}}" initial-time="{{playVideoDuration}}" bindplay="bindplay" bindpause="bindpause" enable-auto-rotation="true" binderror="videoErrorCallback" bindtimeupdate="timeUpdate" show-play-btn="ture" show-mute-btn="true" controls bindended="chechEndStatus" id="myVideo">
 	</video>
 	</video>
 	<view class="text_box">
 	<view class="text_box">
 		<view class="title">{{title}}</view>
 		<view class="title">{{title}}</view>

+ 4 - 11
pages/dbVideo/dbVideo.js

@@ -6,27 +6,20 @@ Page({
     url: '',
     url: '',
     title:'',
     title:'',
     message:'',
     message:'',
-    playTimes:0,
-    id: 0
+    playTimes:0
   },
   },
-  onReady: function () {},
-  async onLoad (options) {
-    this.setData({
-      id: options.id
-    })
+  onLoad (options) {
     wx.request({
     wx.request({
       method: "POST",
       method: "POST",
-      url: app.globalData.publicUrl + '/wx/course/queryById?id=' + this.data.id,
+      url: app.globalData.publicUrl + '/wx/course/queryById?id=' + options.id,
       success: (e) => {
       success: (e) => {
         this.setData({
         this.setData({
           url: e.data.url,
           url: e.data.url,
-          show: false,
           title:e.data.list.courseInfo,
           title:e.data.list.courseInfo,
           message: e.data.list.courseName,
           message: e.data.list.courseName,
           playTimes: e.data.list.playTimes
           playTimes: e.data.list.playTimes
         })
         })
       }
       }
     })
     })
-  },
-
+  }
 })
 })

+ 48 - 7
pages/demandCourses/demandCourses.js

@@ -4,26 +4,66 @@ Page({
   data: {
   data: {
     lbArr: [],
     lbArr: [],
     showNull: false,
     showNull: false,
-    sfmArr: []
+    sfmArr: [],
+    currentId: null,
+    currentName: ""
   },
   },
+  // 点击按跳转
   goIn(e) {
   goIn(e) {
     let id = e.currentTarget.dataset.item.id
     let id = e.currentTarget.dataset.item.id
-    wx.navigateTo({
-      url: '../dbDetails/dbDetails?id=' + id
-    })
+    if (this.data.currentId != null) {
+      // 没学或者没学完
+      if (e.currentTarget.dataset.item.isDone == 0) {
+        if (id == this.data.currentId) {
+          wx.navigateTo({
+            url: '../dbDetails/dbDetails?id=' + id
+          })
+        } else {
+          // 有未完成的但不是我 就不能跳转
+          wx.showModal({
+            showCancel: false,
+            content: "您的" + this.data.currentName + "课还未学完,快去学习吧"
+          })
+        }
+      } else {
+        // 我看完了这个视频 还能看
+        wx.navigateTo({
+          url: '../dbDetails/dbDetails?id=' + id
+        })
+      }
+    } else {
+      wx.navigateTo({
+        url: '../dbDetails/dbDetails?id=' + id
+      })
+    }
   },
   },
+  // 录播列表
   getArr(sessionKey) {
   getArr(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectRecordBySessionKey',
       url: app.globalData.publicUrl + '/wx/course/selectRecordBySessionKey',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
           this.setData({
           this.setData({
-            lbArr: res.data.list
+            lbArr: res.data.list,
+            currentName: "",
+            currentId: null
           })
           })
+          for (let i = 0; i < res.data.list.length; i++) {
+            // 这个节课未全部完成
+            if (res.data.list[i].isDone == 0) {
+              // 这个视频已经进行了 看一半或者看完了
+              if (res.data.list[i].isStudyDone == 0 || res.data.list[i].isStudyDone == 1) {
+                this.setData({
+                  currentName: res.data.list[i].courseName,
+                  currentId: res.data.list[i].id
+                })
+              }
+            }
+          }
           let result = [];
           let result = [];
           for (let i = 0; i < res.data.list.length; i++) {
           for (let i = 0; i < res.data.list.length; i++) {
             result.push({
             result.push({
@@ -66,6 +106,7 @@ Page({
       }
       }
     })
     })
   },
   },
+  // 时间处理
   handler(value) {
   handler(value) {
     const second = Math.floor(value / 1000); //判断是否够1秒
     const second = Math.floor(value / 1000); //判断是否够1秒
     if (second < 1) {
     if (second < 1) {
@@ -84,7 +125,7 @@ Page({
     const hoursValue = hours % 60; //小时
     const hoursValue = hours % 60; //小时
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
   },
   },
-  async onLoad() {
+  async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
     const sessionKey = await tools.checkSessionAndLogin();
     this.getArr(sessionKey)
     this.getArr(sessionKey)
   }
   }

+ 1 - 1
pages/demandCourses/demandCourses.wxml

@@ -1,5 +1,5 @@
 <view class="container">
 <view class="container">
-	<view class="class_box" wx:for="{{lbArr}}" wx:for-index="idx" wx:for-item="item">
+	<view class="class_box" wx:for="{{lbArr}}" wx:for-index="idx" wx:for-item="item" wx:key="index">
 		<view bindtap="goIn" data-item="{{item}}">
 		<view bindtap="goIn" data-item="{{item}}">
 			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>
 			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>
 			<view class="sctext">
 			<view class="sctext">

+ 1 - 165
pages/evaluationCourse/evaluationCourse.js

@@ -1,5 +1,3 @@
-//index.js
-//获取应用实例    studentRegistration
 const app = require('../../utils/util.js');
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 const tools = require('../../utils/tools.js');
 Page({
 Page({
@@ -35,169 +33,7 @@ Page({
       }
       }
       return value;
       return value;
     },
     },
-    questionList: [
-      // {
-      //   "QuestType": "6",
-      //   "Id": 11,
-      //   name: 'ccccc',
-      //   QuestStem: '时间选择',
-      //   QuestAnswer: ''
-      // },
-      // {
-      //   "QuestType": "5",
-      //   "Id": 11,
-      //   name: 'dddd',
-      //   QuestStem: '姓名输入',
-      //   QuestAnswer: ''
-      // },
-      // {
-      //   "QuestType": "6",
-      //   "Id": 11,
-      //   name: 'username111',
-      //   QuestStem: '时间2',
-      //   QuestAnswer: ''
-      // },
-      // {
-      //   "QuestType": "5",
-      //   "Id": 11,
-      //   name: 'address',
-      //   QuestStem: '姓名输入',
-      //   QuestAnswer: ''
-      // },
-      // {
-      //   "QuestType": "0",
-      //   "QuestChoice": [{
-      //       value: 'USA',
-      //       name: '美国'
-      //     },
-      //     {
-      //       value: 'CHN',
-      //       name: '中国',
-      //       checked: 'true'
-      //     },
-      //     {
-      //       value: 'BRA',
-      //       name: '巴西'
-      //     },
-      //     {
-      //       value: 'JPN',
-      //       name: '日本'
-      //     },
-      //     {
-      //       value: 'ENG',
-      //       name: '英国'
-      //     },
-      //     {
-      //       value: 'FRA',
-      //       name: '法国'
-      //     },
-      //   ],
-      //   "Id": 36,
-      //   name: 'sex',
-      //   QuestStem: '性别单选'
-      // },
-      // {
-      //   "QuestType": "0",
-      //   "QuestChoice": [{
-      //       value: '男',
-      //       name: '男',
-      //       checked: false,
-      //     },
-      //     {
-      //       value: '女',
-      //       name: '女',
-      //       checked: false,
-      //     },
-      //   ],
-      //   "Id": 36,
-      //   name: 'sex111',
-      //   QuestStem: '性别单选2222'
-      // },
-      // {
-      //   "QuestType": "1",
-      //   "QuestAnswer": "equals ()||\nhashCode()||",
-      //   "QuestChoice": [{
-      //       value: 'USA',
-      //       name: '美国'
-      //     },
-      //     {
-      //       value: 'CHN',
-      //       name: '中国',
-      //       checked: false
-      //     },
-      //     {
-      //       value: 'FRA',
-      //       name: '法国'
-      //     }
-      //   ],
-      //   "Id": 38,
-      //   name: 'alls',
-      //   QuestStem: '多选'
-      // },
-
-      // {
-      //   "QuestType": "2",
-      //   "QuestStem": "1+1=2",
-      //   "QuestAnswer": "是",
-      //   "QuestChoice": [{
-      //       value: 'USA',
-      //       name: '是'
-      //     },
-      //     {
-      //       value: 'CHN',
-      //       name: '中国',
-      //       checked: false
-      //     },
-      //   ],
-      //   "Id": 42,
-      //   name: 'lllll',
-      //   QuestStem: '判断1'
-      // },
-      // {
-      //   "QuestType": "2",
-      //   "QuestStem": "1+1=2",
-      //   "QuestAnswer": "是",
-      //   "QuestChoice": [{
-      //       value: 'USA',
-      //       name: '是'
-      //     },
-      //     {
-      //       value: 'CHN',
-      //       name: '中国',
-      //       checked: false
-      //     },
-      //   ],
-      //   "Id": 42,
-      //   name: 'lllll',
-      //   QuestStem: '判断2'
-      // },
-      // {
-      //   "QuestType": "2",
-      //   "QuestStem": "1+1=2",
-      //   "QuestAnswer": "是",
-      //   "QuestChoice": [{
-      //       value: 'USA',
-      //       name: '是'
-      //     },
-      //     {
-      //       value: 'CHN',
-      //       name: '中国',
-      //       checked: false
-      //     },
-      //   ],
-      //   "Id": 42,
-      //   name: 'lllll',
-      //   QuestStem: '判断3'
-      // },
-      // {
-      //   "QuestType": "3",
-      //   "QuestStem": "世纪大厦的萨科技的哈市(解答)",
-      //   "QuestAnswer": "",
-      //   "QuestChoice": "",
-      //   "Id": 39,
-      //   name: 'textarea',
-      // },
-    ],
+    questionList: [],
     answersId: '', // 提交答案用到
     answersId: '', // 提交答案用到
     sessionKey: '',
     sessionKey: '',
     paperId: '',
     paperId: '',

+ 3 - 31
pages/evaluationCourse/evaluationCourse.wxml

@@ -1,11 +1,6 @@
 <view class='container'>
 <view class='container'>
 	<view class="box">
 	<view class="box">
 		<van-divider contentPosition="center" customStyle="color: #666666; border-color: #b9b9b9; font-size: 25rpx;">您对此次课程满意么?</van-divider>
 		<van-divider contentPosition="center" customStyle="color: #666666; border-color: #b9b9b9; font-size: 25rpx;">您对此次课程满意么?</van-divider>
-		<!-- <view class='parameter-wrap'>
-			<block wx:for="{{manyi}}" wx:key="manyi">
-				<text class='manyi-info {{item.checked?"checked_parameter":""}}' name="" data-id='{{item.id}}' bindtap='parameterTap'>{{item.name}}</text>
-			</block>
-		</view> -->
 		<view wx:for="{{questionList}}">
 		<view wx:for="{{questionList}}">
 			<view class='fwb' wx:if="{{ item.QuestType == 0}}">
 			<view class='fwb' wx:if="{{ item.QuestType == 0}}">
 				<view class="xingbie">{{item.QuestStem}}</view>
 				<view class="xingbie">{{item.QuestStem}}</view>
@@ -15,7 +10,6 @@
 							<radio value="{{ item.value }}" />{{item.name}}
 							<radio value="{{ item.value }}" />{{item.name}}
 						</label>
 						</label>
 					</radio-group>
 					</radio-group>
-					<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class='fwb' wx:if="{{ item.QuestType == 1}}">
 			<view class='fwb' wx:if="{{ item.QuestType == 1}}">
@@ -26,37 +20,15 @@
 							<checkbox value="{{ item.value }}" />{{item.name}}
 							<checkbox value="{{ item.value }}" />{{item.name}}
 						</label>
 						</label>
 					</checkbox-group>
 					</checkbox-group>
-					<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class='fwb' wx:if="{{ item.QuestType == 3}}">
 			<view class='fwb' wx:if="{{ item.QuestType == 3}}">
 				<view class="xingbie">{{item.QuestStem}}</view>
 				<view class="xingbie">{{item.QuestStem}}</view>
 				<view class='weui-input'>
 				<view class='weui-input'>
 					<textarea value="{{item.QuestAnswer}}" name="{{item.name}}" data-index='{{index}}' data-questTypes='{{item.QuestType}}' data-idx='{{item.Id}}' bindinput='bindTextAreaBlur' placeholder="请输入" maxlength='500' />
 					<textarea value="{{item.QuestAnswer}}" name="{{item.name}}" data-index='{{index}}' data-questTypes='{{item.QuestType}}' data-idx='{{item.Id}}' bindinput='bindTextAreaBlur' placeholder="请输入" maxlength='500' />
-					<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
-				</view>
+					</view>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-
-	<!-- <view class="box" style="background:rgba(244,244,244,1);margin-top:80rpx;margin-bottom:50rpx">
-		<checkbox-group bindchange="checkboxChange" name="orientation" class="group">
-			<label class="rzqxList" wx:key="unique" wx:for="{{checkboxArr}}" wx:for-item="item">
-				<checkbox value="{{item.code}}" checked="{{item.checked}}" />{{item.name}}
-			</label>
-		</checkbox-group>
-	</view> -->
-	<!-- <view class="box11" style="background:rgba(244,244,244,1);margin-top:80rpx;margin-bottom:50rpx">
-		<block wx:for="{{checkboxArr}}" wx:key="id">
-			<view class="rzqxList {{item.checked?'xuanzhongbox':''}} ">
-				<view catchtap='checkboxChange' id="{{item.id}}">
-					{{item.name}}
-				</view>
-			</view>
-		</block>
-	</view>
-	<textarea placeholder-style="font-size:26rpx;" class="view_textarea" value="{{remarks}}" name="remarks" bindblur="bindTextAreaBlur" placeholder="还想说点啥?写在这里吧!">
-    </textarea> -->
-					<button class="mini-btn" bindtap="submitForm">提交评价</button>
-
-				</view>
+<button class="mini-btn" bindtap="submitForm">提交评价</button>
+</view>

+ 39 - 26
pages/evaluationCourse/evaluationCourse.wxss

@@ -1,40 +1,43 @@
-/* .box {
-  margin: 40rpx 40rpx 0 40rpx;
-} */
-.box{
+.box {
   width: 90%;
   width: 90%;
   margin-left: 5%;
   margin-left: 5%;
-  
+
 }
 }
+
 .manyi-info {
 .manyi-info {
-  border:2rpx solid rgba(211,211,211,1);
+  border: 2rpx solid rgba(211, 211, 211, 1);
   padding: 20rpx 50rpx;
   padding: 20rpx 50rpx;
   margin: 20rpx;
   margin: 20rpx;
   border-radius: 10rpx;
   border-radius: 10rpx;
 }
 }
+
 .parameter-wrap {
 .parameter-wrap {
   text-align: center;
   text-align: center;
   margin-top: 60rpx;
   margin-top: 60rpx;
 }
 }
+
 .checked_parameter {
 .checked_parameter {
-  background:linear-gradient(90deg,rgba(215,47,29,1),rgba(249,157,48,1));
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1));
   color: white;
   color: white;
   border: none;
   border: none;
 }
 }
-.rzqxList{
+
+.rzqxList {
   padding: 18rpx;
   padding: 18rpx;
-  border:2rpx solid rgba(211,211,211,1);
+  border: 2rpx solid rgba(211, 211, 211, 1);
   float: left;
   float: left;
-  margin:10rpx;
+  margin: 10rpx;
   font-size: 25rpx;
   font-size: 25rpx;
   background: white;
   background: white;
-  color: #7E7E7E; 
+  color: #7E7E7E;
   border-radius: 10rpx;
   border-radius: 10rpx;
 }
 }
-.group{
+
+.group {
   margin-left: 3%;
   margin-left: 3%;
 }
 }
-.view_textarea{
+
+.view_textarea {
   border: 1px solid rgba(217, 217, 217, 1);
   border: 1px solid rgba(217, 217, 217, 1);
   padding: 0 20rpx;
   padding: 0 20rpx;
   height: 200rpx;
   height: 200rpx;
@@ -43,34 +46,41 @@
   font-size: 20rpx;
   font-size: 20rpx;
   /* margin-top: 100rpx; */
   /* margin-top: 100rpx; */
 }
 }
-.rzqxList checkbox{
+
+.rzqxList checkbox {
   display: none
   display: none
 }
 }
-.mini-btn{
-  background:linear-gradient(90deg,rgba(215,47,29,1),rgba(249,157,48,1));
+
+.mini-btn {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1));
   color: white;
   color: white;
   font-size: 30rpx;
   font-size: 30rpx;
   margin-top: 100rpx;
   margin-top: 100rpx;
   margin-bottom: 100rpx;
   margin-bottom: 100rpx;
 }
 }
+
 button:not([size='mini']) {
 button:not([size='mini']) {
-  width: 80%!important;
+  width: 80% !important;
 }
 }
-.xuanzhongbox{
-  background:linear-gradient(90deg,rgba(215,47,29,1),rgba(249,157,48,1));
+
+.xuanzhongbox {
+  background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1));
   color: white;
   color: white;
 }
 }
-.box11{
+
+.box11 {
   width: 90%;
   width: 90%;
   margin-left: 5%;
   margin-left: 5%;
   height: 200rpx;
   height: 200rpx;
   margin-top: 50rpx;
   margin-top: 50rpx;
-  background:rgba(244,244,244,1)
+  background: rgba(244, 244, 244, 1)
 }
 }
-.rzqxList:first-child{
+
+.rzqxList:first-child {
   margin-left: 30rpx;
   margin-left: 30rpx;
 }
 }
-.rzqxList:nth-child(5){
+
+.rzqxList:nth-child(5) {
   margin-left: 30rpx;
   margin-left: 30rpx;
 }
 }
 
 
@@ -89,16 +99,17 @@ button:not([size='mini']) {
   color: rgba(51, 51, 51, 1);
   color: rgba(51, 51, 51, 1);
   width: 200rpx;
   width: 200rpx;
   line-height: 80rpx;
   line-height: 80rpx;
-  border:2rpx solid rgba(211,211,211,1);
+  border: 2rpx solid rgba(211, 211, 211, 1);
   padding: 10rpx 30rpx;
   padding: 10rpx 30rpx;
   margin: 20rpx;
   margin: 20rpx;
   border-radius: 10rpx;
   border-radius: 10rpx;
 
 
 }
 }
+
 .checkboxbox {
 .checkboxbox {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
   color: white !important;
- 
+
 }
 }
 
 
 
 
@@ -110,14 +121,16 @@ textarea {
   height: 194rpx;
   height: 194rpx;
   margin-top: 20rpx;
   margin-top: 20rpx;
 }
 }
+
 .xingbie {
 .xingbie {
   font-size: 28rpx;
   font-size: 28rpx;
 }
 }
+
 .my-choosebox1 {
 .my-choosebox1 {
   color: rgba(51, 51, 51, 1);
   color: rgba(51, 51, 51, 1);
   width: 100rpx;
   width: 100rpx;
   line-height: 100rpx;
   line-height: 100rpx;
-  border:2rpx solid rgba(211,211,211,1);
+  border: 2rpx solid rgba(211, 211, 211, 1);
   padding: 5rpx 10rpx;
   padding: 5rpx 10rpx;
   margin: 20rpx;
   margin: 20rpx;
   border-radius: 10rpx;
   border-radius: 10rpx;

+ 2 - 3
pages/evaluationCourseDetail/evaluationCourseDetail.js

@@ -1,5 +1,4 @@
-//index.js
-//获取应用实例
+
 const app = require('../../utils/util.js');
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 const tools = require('../../utils/tools.js');
 Page({
 Page({
@@ -25,7 +24,7 @@ Page({
   },
   },
   async onLoad(options) {
   async onLoad(options) {
     let answersId = options.answersId;
     let answersId = options.answersId;
-    const sessionKey = 'yoa0rZTt2bAiTVDsiRjysw==';
+    const sessionKey = await tools.checkSessionAndLogin();
     this.chengji(sessionKey, answersId);
     this.chengji(sessionKey, answersId);
   }
   }
 })
 })

+ 1 - 1
pages/evaluationCourseDetail/evaluationCourseDetail.wxml

@@ -1,7 +1,7 @@
 <view class="home">
 <view class="home">
 	<view class="box">
 	<view class="box">
 		<view class="redk"></view>我的评价
 		<view class="redk"></view>我的评价
-		<view class="cuoti-box" wx:for="{{gridArr}}">
+		<view class="cuoti-box" wx:for="{{gridArr}}" wx:key="index">
 			<view class="number">
 			<view class="number">
 				{{index+1}}
 				{{index+1}}
 			</view>
 			</view>

+ 3 - 5
pages/exhibitionList/exhibitionList.js

@@ -23,17 +23,15 @@ Page({
     })
     })
   },
   },
   onLoad: function (options) {
   onLoad: function (options) {
-    let that = this;
-    that.setData({
+    this.setData({
       active: Number(options.id)
       active: Number(options.id)
     })
     })
-    let _active = that.data.active + 1
+    let _active = this.data.active + 1
     wx.request({
     wx.request({
       method: "post",
       method: "post",
       url: app.globalData.publicUrl + '/wx/course/listByCourseTag?tag=' + _active,
       url: app.globalData.publicUrl + '/wx/course/listByCourseTag?tag=' + _active,
       success: (e) => {
       success: (e) => {
-        that.data.xcpArr = [];
-        that.setData({
+        this.setData({
           xcpArr: e.data.list,
           xcpArr: e.data.list,
         })
         })
       }
       }

+ 0 - 5
pages/exhibitionList/exhibitionList.wxml

@@ -7,7 +7,6 @@
 					<view class="grayblock">
 					<view class="grayblock">
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 						<view class="viedoxx">
-							<!-- <view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">理论阵地</view> -->
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 							</view>
 							</view>
@@ -23,8 +22,6 @@
 					<view class="grayblock">
 					<view class="grayblock">
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 						<view class="viedoxx">
-
-							<!-- <view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">我的学院</view> -->
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 							</view>
 							</view>
@@ -40,7 +37,6 @@
 					<view class="grayblock">
 					<view class="grayblock">
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 						<view class="viedoxx">
-							<!-- <view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">特色课程</view> -->
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 							</view>
 							</view>
@@ -56,7 +52,6 @@
 					<view class="grayblock">
 					<view class="grayblock">
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="show_text">{{item.courseName}}</view>
 						<view class="viedoxx">
 						<view class="viedoxx">
-							<!-- <view style="color:#e82315;font-size:25rpx;font-weight:500;float:left">精细管理</view> -->
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 							<view style="color:#848585;font-size:22rpx;float:right;margin-right:20rpx">
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 								<image src='/images/qb.png' mode='aspectFill' class="qb"></image>{{item.playTimes}}人看过
 							</view>
 							</view>

+ 0 - 4
pages/exhibitionList/exhibitionList.wxss

@@ -1,14 +1,11 @@
 .xczs {
 .xczs {
   width: 720rpx;
   width: 720rpx;
   margin-left: 20rpx;
   margin-left: 20rpx;
-  /* height: 250rpx; */
-  /* border: 1px solid yellow; */
   margin-top: 20rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
   margin-bottom: 20rpx;
   display: flex;
   display: flex;
   display: block;
   display: block;
 }
 }
-
 .zb1 {
 .zb1 {
   width: 338rpx;
   width: 338rpx;
   height: 283rpx;
   height: 283rpx;
@@ -23,7 +20,6 @@
 .show1 {
 .show1 {
   width: 338rpx;
   width: 338rpx;
   height: 283rpx;
   height: 283rpx;
-  /* border: 1px solid red; */
 }
 }
 
 
 .show_text {
 .show_text {

+ 0 - 1
pages/feedBack/feedBack.js

@@ -424,7 +424,6 @@ Page({
     return fmt;
     return fmt;
 
 
   },
   },
-  onReady: function () {},
   async onLoad(options) {
   async onLoad(options) {
     const sessionKey = await tools.checkSessionAndLogin();
     const sessionKey = await tools.checkSessionAndLogin();
     wx.setStorageSync('answersId', options.answersId);
     wx.setStorageSync('answersId', options.answersId);

+ 2 - 2
pages/grade/grade.js

@@ -9,8 +9,8 @@ Page({
       url: app.globalData.publicUrl + '/wx/answer/detail',
       url: app.globalData.publicUrl + '/wx/answer/detail',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey,
-        answersId: answersId
+        sessionKey,
+        answersId
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {

+ 0 - 61
pages/groupsList/groupsList.js

@@ -1,9 +1,4 @@
-// pages/groupsList/groupsList.js
 Page({
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
   data: {
     Arr: [{
     Arr: [{
       name: "周勉征",
       name: "周勉征",
@@ -26,61 +21,5 @@ Page({
       zw: "项目秘书",
       zw: "项目秘书",
       phone: "18604413379"
       phone: "18604413379"
     }]
     }]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
   }
 })
 })

+ 0 - 4
pages/groupsList/groupsList.wxss

@@ -1,4 +1,3 @@
-/* pages/groupsList/groupsList.wxss */
 .block {
 .block {
   width: 650rpx;
   width: 650rpx;
   height: 160rpx;
   height: 160rpx;
@@ -8,7 +7,6 @@
   box-shadow: rgba(235, 63, 51, 0.2) 0px 0px 10px;
   box-shadow: rgba(235, 63, 51, 0.2) 0px 0px 10px;
   border-radius: 10rpx;
   border-radius: 10rpx;
 }
 }
-
 .h1 {
 .h1 {
   width: 70%;
   width: 70%;
   height: 80rpx;
   height: 80rpx;
@@ -16,11 +14,9 @@
   line-height: 80rpx;
   line-height: 80rpx;
   font-size: 30rpx;
   font-size: 30rpx;
 }
 }
-
 .name {
 .name {
   float: left;
   float: left;
 }
 }
-
 .zw {
 .zw {
   float: right;
   float: right;
   color: #858888;
   color: #858888;

+ 2 - 1
pages/historyClass/historyClass.js

@@ -77,6 +77,7 @@ Page({
     const hoursValue = hours % 60; //小时
     const hoursValue = hours % 60; //小时
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
   },
   },
+  // 检查综合反馈是否填写完
   checkTaskList(sessionKey) {
   checkTaskList(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/status',
       url: app.globalData.publicUrl + '/wx/exam/status',
@@ -94,7 +95,7 @@ Page({
       }
       }
     })
     })
   },
   },
-  // 综合反馈填写
+  // 历史班综合反馈填写
   goWrite2() {
   goWrite2() {
     if (this.data.istask) {
     if (this.data.istask) {
       wx.request({
       wx.request({

+ 0 - 6
pages/historyClass/historyClass.wxss

@@ -29,12 +29,6 @@
   line-height: 50rpx;
   line-height: 50rpx;
   height: 50vh;
   height: 50vh;
 }
 }
-
-/* .cloudimg{
-  width: 733rpx;
-  height: 220rpx; 
-  border: 1px solid red;
-} */
 .layout {
 .layout {
   width: 693rpx;
   width: 693rpx;
   margin-left: 28rpx;
   margin-left: 28rpx;

+ 21 - 28
pages/index/index.js

@@ -26,8 +26,15 @@ Page({
       name: "测试答卷",
       name: "测试答卷",
       isread: true
       isread: true
     }],
     }],
-    xczsArr: []
-  },
+    xczsArr: [],
+    goGridArr: [
+      '/pages/onlineClass/onlineClass',
+      '/pages/demandCourses/demandCourses',
+      '/pages/InteractiveQA/InteractiveQA',
+      '/pages/testAnswer/testAnswer'
+    ]
+  },
+  // 轮播点击去上课跳转到我的班级
   gomyClass(e) {
   gomyClass(e) {
     if (e.currentTarget.dataset.item.isActive == 5) {
     if (e.currentTarget.dataset.item.isActive == 5) {
       wx.switchTab({
       wx.switchTab({
@@ -90,24 +97,9 @@ Page({
   },
   },
   // 首页的四个点击
   // 首页的四个点击
   goGrid(e) {
   goGrid(e) {
-    if (e.currentTarget.dataset.id == 0) {
-      wx.navigateTo({
-        url: '/pages/onlineClass/onlineClass',
-      })
-    } else if (e.currentTarget.dataset.id == 1) {
-      wx.navigateTo({
-        url: '/pages/demandCourses/demandCourses',
-      })
-    } else if (e.currentTarget.dataset.id == 2) {
-      wx.navigateTo({
-        // url: '/pages/myInteractions/myInteractions',
-        url:'/pages/InteractiveQA/InteractiveQA'
-      })
-    } else if (e.currentTarget.dataset.id == 3) {
-      wx.navigateTo({
-        url: '/pages/testAnswer/testAnswer',
-      })
-    }
+    wx.navigateTo({
+      url: this.data.goGridArr[e.currentTarget.dataset.id]
+    })
   },
   },
   // banner图
   // banner图
   getBanner(sessionKey) {
   getBanner(sessionKey) {
@@ -115,7 +107,7 @@ Page({
       url: app.globalData.publicUrl + '/wx/student/selAllClas',
       url: app.globalData.publicUrl + '/wx/student/selAllClas',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.data.claList.length != 0) {
         if (res.data.data.claList.length != 0) {
@@ -123,17 +115,16 @@ Page({
             bnrUrl: res.data.data.claList
             bnrUrl: res.data.data.claList
           })
           })
         }
         }
-
       }
       }
     })
     })
   },
   },
-  // 即将开班
+  // 即将开班有几个
   getjjLength(sessionKey) {
   getjjLength(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey,
+        sessionKey,
         isActive: "0"
         isActive: "0"
       },
       },
       success: (res) => {
       success: (res) => {
@@ -144,13 +135,13 @@ Page({
       }
       }
     })
     })
   },
   },
-  // 往期开班
+  // 往期开班有几个
   getwqLength(sessionKey) {
   getwqLength(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       url: app.globalData.publicUrl + '/wx/student/selClasToo',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey,
+        sessionKey,
         isActive: "2"
         isActive: "2"
       },
       },
       success: (res) => {
       success: (res) => {
@@ -173,14 +164,14 @@ Page({
       }
       }
     })
     })
   },
   },
+   // 四个宣传图onshow
   getfour1() {
   getfour1() {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/listCategory',
       url: app.globalData.publicUrl + '/wx/course/listCategory',
       method: "post",
       method: "post",
       success: (res) => {
       success: (res) => {
         if (this.data.xczsArr.length != 0) {
         if (this.data.xczsArr.length != 0) {
-          if (this.data.xczsArr.sort().toString() == res.data.list.sort().toString()) {
-          } else {
+          if (this.data.xczsArr.sort().toString() != res.data.list.sort().toString()) {
             this.setData({
             this.setData({
               xczsArr: res.data.list
               xczsArr: res.data.list
             })
             })
@@ -189,6 +180,7 @@ Page({
       }
       }
     })
     })
   },
   },
+   // 第一个小红点
   getRedPoint1(sessionKey) {
   getRedPoint1(sessionKey) {
     let completeStatus1 = `gridArr[${0}].isread`;
     let completeStatus1 = `gridArr[${0}].isread`;
     let completeStatus2 = `gridArr[${1}].isread`;
     let completeStatus2 = `gridArr[${1}].isread`;
@@ -212,6 +204,7 @@ Page({
       }
       }
     })
     })
   },
   },
+  // 第四个小红点
   getRedPoint4(sessionKey) {
   getRedPoint4(sessionKey) {
     let completeStatus = `gridArr[${3}].isread`;
     let completeStatus = `gridArr[${3}].isread`;
     wx.request({
     wx.request({

+ 0 - 5
pages/index/index.wxml

@@ -35,14 +35,9 @@
 		</van-grid-item>
 		</van-grid-item>
 	</van-grid>
 	</van-grid>
 	<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
 	<view style="height:15rpx;width:750rpx;background-color:#F2F2F2"></view>
-	<!-- <view class="qy_title">
-		<view class="redk"></view>我们的学院
-		<view class="more" bindtap="xczsMore">查看全部 ></view>
-	</view> -->
 	<view class="xczs">
 	<view class="xczs">
 		<view class="zb1" wx:for="{{xczsArr}}" wx:for-index="idx" wx:for-item="item" bindtap="turnDetails" id="{{idx}}" wx:key="idx">
 		<view class="zb1" wx:for="{{xczsArr}}" wx:for-index="idx" wx:for-item="item" bindtap="turnDetails" id="{{idx}}" wx:key="idx">
 			<image src='{{item.img}}' mode="aspectFill" class="show1"></image>
 			<image src='{{item.img}}' mode="aspectFill" class="show1"></image>
-			<!-- <van-image fit="fill" width="338rpx" height="260rpx" lazy-load src='{{item.img}}' /> -->
 			<view class="grayblock">
 			<view class="grayblock">
 				<view class="show_text">{{item.name}}</view>
 				<view class="show_text">{{item.name}}</view>
 				<view class="viedoxx">
 				<view class="viedoxx">

+ 10 - 10
pages/last/last.js

@@ -56,14 +56,7 @@ Page({
       }
       }
     })
     })
   },
   },
-  async onLoad() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    this.setData({
-      sessionKey: sessionKey
-    })
-    this.isClass(sessionKey);
-  },
-  getBanner(sessionKey) {
+  getExamList(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/quesExamList',
       url: app.globalData.publicUrl + '/wx/exam/quesExamList',
       method: "post",
       method: "post",
@@ -92,7 +85,7 @@ Page({
       }
       }
     })
     })
   },
   },
-  // 查询我是否有班&&班级名字
+  // 查询我是否有班&&班级id
   isClass(sessionKey) {
   isClass(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selMyClas',
       url: app.globalData.publicUrl + '/wx/student/selMyClas',
@@ -105,7 +98,7 @@ Page({
           this.setData({
           this.setData({
             classInfo: res.data.data
             classInfo: res.data.data
           })
           })
-          this.getBanner(sessionKey);
+          this.getExamList(sessionKey);
         } else {
         } else {
           wx.showModal({
           wx.showModal({
             content: "您当前还没有开放的班级!",
             content: "您当前还没有开放的班级!",
@@ -123,4 +116,11 @@ Page({
       }
       }
     })
     })
   },
   },
+  async onLoad() {
+    const sessionKey = await tools.checkSessionAndLogin();
+    this.setData({
+      sessionKey: sessionKey
+    })
+    this.isClass(sessionKey);
+  },
 })
 })

+ 0 - 2
pages/last/last.wxml

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

+ 0 - 3
pages/last/last.wxss

@@ -3,8 +3,6 @@
   margin-left: 20rpx;
   margin-left: 20rpx;
   height: 165rpx;
   height: 165rpx;
   padding-bottom: 50rpx;
   padding-bottom: 50rpx;
-  /* border: 1px solid red; */
-  /* margin-top: 30rpx; */
   position: relative;
   position: relative;
   border-bottom: 1px solid #d4d4d4;
   border-bottom: 1px solid #d4d4d4;
 }
 }
@@ -40,7 +38,6 @@
   text-align: center;
   text-align: center;
   display: inline-block;
   display: inline-block;
   padding: 5rpx;
   padding: 5rpx;
-  /* margin-bottom: 30rpx; */
 }
 }
 
 
 .isanswertag {
 .isanswertag {

+ 0 - 9
pages/lastdetail/lastdetail.wxml

@@ -30,10 +30,8 @@
 						<radio value="{{ item.value }}" />{{item.name}}
 						<radio value="{{ item.value }}" />{{item.name}}
 					</label>
 					</label>
 				</radio-group>
 				</radio-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 			</view>
 		</view>
 		</view>
-
 		<view class='fwb' wx:if="{{ item.QuestType == 1}}">
 		<view class='fwb' wx:if="{{ item.QuestType == 1}}">
 			<view class="red-image">
 			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
@@ -45,10 +43,8 @@
 						<checkbox value="{{ item.value }}" />{{item.name}}
 						<checkbox value="{{ item.value }}" />{{item.name}}
 					</label>
 					</label>
 				</checkbox-group>
 				</checkbox-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 			</view>
 		</view>
 		</view>
-
 		<view class='fwb' wx:if="{{ item.QuestType == 2}}">
 		<view class='fwb' wx:if="{{ item.QuestType == 2}}">
 			<view class="red-image">
 			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
@@ -60,25 +56,20 @@
 						<radio value="{{ item.value }}" />{{item.name}}
 						<radio value="{{ item.value }}" />{{item.name}}
 					</label>
 					</label>
 				</radio-group>
 				</radio-group>
-				<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
 			</view>
 			</view>
 		</view>
 		</view>
-		
 		<view class='fwb' wx:if="{{ item.QuestType == 6}}"> 
 		<view class='fwb' wx:if="{{ item.QuestType == 6}}"> 
 				<view class="red-image">
 				<view class="red-image">
 					<image src="/images/quan.png" style="width:20rpx;height:20rpx;"> </image>
 					<image src="/images/quan.png" style="width:20rpx;height:20rpx;"> </image>
 				</view>
 				</view>
 				<view class="xingbie">{{item.QuestStem}}</view>
 				<view class="xingbie">{{item.QuestStem}}</view>
 			<view class='weui-input' style="font-size: 26rpx;  line-height: 56rpx;"  data-index = '{{index}}' data-names='{{item.name}}'  catchtap="share1" name="{{item.name}}">
 			<view class='weui-input' style="font-size: 26rpx;  line-height: 56rpx;"  data-index = '{{index}}' data-names='{{item.name}}'  catchtap="share1" name="{{item.name}}">
-					<!-- QuestAnswer   chooseValue[index].currentAnswer -->
 			{{questionList[index].QuestAnswer}}<view wx:if='{{!questionList[index].QuestAnswer}}' style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx" >请选择</view>
 			{{questionList[index].QuestAnswer}}<view wx:if='{{!questionList[index].QuestAnswer}}' style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx" >请选择</view>
-					<!-- <view class="{{renzhishijianIsTrue?'error':'noerror'}}">请输入任职时间</view> -->
 				</view>
 				</view>
 				<van-popup  show="{{ postshow[index] }}" position="bottom" custom-style="height: 50%;">
 				<van-popup  show="{{ postshow[index] }}" position="bottom" custom-style="height: 50%;">
 					<van-datetime-picker  data-index='{{index}}' data-questTypes='{{item.QuestType}}' data-idx = '{{item.Id}}'  bind:confirm="onConfirm" bind:cancel='onClose'  type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
 					<van-datetime-picker  data-index='{{index}}' data-questTypes='{{item.QuestType}}' data-idx = '{{item.Id}}'  bind:confirm="onConfirm" bind:cancel='onClose'  type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
 				</van-popup>
 				</van-popup>
 			</view>
 			</view>
-
 		</view>
 		</view>
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 			<van-button   round bindtap="submitForm">提交</van-button>
 			<van-button   round bindtap="submitForm">提交</van-button>

+ 0 - 3
pages/lastdetail/lastdetail.wxss

@@ -8,17 +8,14 @@ van-button {
   text-align: center;
   text-align: center;
   margin: 0 60rpx;
   margin: 0 60rpx;
 }
 }
-
 .van-button--default {
 .van-button--default {
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   background: linear-gradient(90deg, rgba(215, 47, 29, 1), rgba(249, 157, 48, 1)) !important;
   color: white !important;
   color: white !important;
 
 
 }
 }
-
 .van-field__input {
 .van-field__input {
   background: #F4F4F4 !important;
   background: #F4F4F4 !important;
 }
 }
-
 button:not([size='mini']) {
 button:not([size='mini']) {
   width: 550rpx !important;
   width: 550rpx !important;
 }
 }

+ 107 - 155
pages/myClass/myClass.js

@@ -9,7 +9,7 @@ Page({
     classInfo: {}, //班级信息
     classInfo: {}, //班级信息
     kcArr: [], //课程列表
     kcArr: [], //课程列表
     sfmArr: [], //换算时分秒数组
     sfmArr: [], //换算时分秒数组
-    studentName: "", //学生
+    studentName: "", //学生
     status: '', //状态
     status: '', //状态
     myCanvasId: 0, //画布id
     myCanvasId: 0, //画布id
     byzsbj: "../../images/zsbj.jpg", //结业证背景  用于合成图片
     byzsbj: "../../images/zsbj.jpg", //结业证背景  用于合成图片
@@ -19,6 +19,8 @@ Page({
     istask2: false, //课程是否完成
     istask2: false, //课程是否完成
     istask3: false, //期末考试是否完成
     istask3: false, //期末考试是否完成
     istask4: false, //综合反馈是否完成
     istask4: false, //综合反馈是否完成
+    currentId: null,
+    currentName: ""
   },
   },
   // 查询我是否认证
   // 查询我是否认证
   isRz(sessionKey) {
   isRz(sessionKey) {
@@ -26,25 +28,11 @@ Page({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
-        if (res.data.code == 0) {
-          if (res.data.data !== null || res.data.data !== "") {
-            this.isClass(sessionKey)
-          } else {
-            wx.showModal({
-              content: "您还没有进行身份认证哦",
-              showCancel: false,
-              success(res) {
-                if (res.confirm) {
-                  wx.redirectTo({
-                    url: '../Identity/Identity'
-                  })
-                }
-              }
-            })
-          }
+        if (res.data.code == 0 && (res.data.data !== null || res.data.data !== "")) {
+          this.isClass(sessionKey)
         } else {
         } else {
           wx.showModal({
           wx.showModal({
             content: "您还没有进行身份认证哦",
             content: "您还没有进行身份认证哦",
@@ -67,42 +55,58 @@ Page({
       url: app.globalData.publicUrl + '/wx/student/selMyClas',
       url: app.globalData.publicUrl + '/wx/student/selMyClas',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
           this.setData({
           this.setData({
             classInfo: res.data.data
             classInfo: res.data.data
           })
           })
-          this.checkTaskList4(sessionKey, res.data.data.id);
+          this.isAgree(sessionKey);
+          this.getMynotice(sessionKey);
+          this.getMycourse(sessionKey);
           this.checkTaskList(sessionKey);
           this.checkTaskList(sessionKey);
           this.checkTaskList3(sessionKey, res.data.data.id);
           this.checkTaskList3(sessionKey, res.data.data.id);
-          this.isAgree(sessionKey);
+          this.checkTaskList4(sessionKey, res.data.data.id);
         } else {
         } else {
-          wx.showModal({
-            content: "您当前还没有正在开放的班级!",
-            showCancel: false,
-            success(res) {
-              if (res.confirm) {
-                wx.switchTab({
-                  url: '../index/index'
-                })
+          if (res.data.msg == "运行时异常:学员不可同时存在两个班级中。") {
+            wx.showModal({
+              content: "学员不可同时存在两个班级中哦",
+              showCancel: false,
+              success(res) {
+                if (res.confirm) {
+                  wx.switchTab({
+                    url: '../index/index'
+                  })
+                }
               }
               }
-            }
-          })
-          return false;
+            })
+            return false;
+          } else {
+            wx.showModal({
+              content: "您当前还没有正在开放的班级!",
+              showCancel: false,
+              success(res) {
+                if (res.confirm) {
+                  wx.switchTab({
+                    url: '../index/index'
+                  })
+                }
+              }
+            })
+            return false;
+          }
         }
         }
       }
       }
     })
     })
   },
   },
   // 协议是否已同意  
   // 协议是否已同意  
   isAgree(sessionKey) {
   isAgree(sessionKey) {
-    // let _this = this;
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0 && res.data.data) {
         if (res.data.code == 0 && res.data.data) {
@@ -117,96 +121,48 @@ Page({
               show: true
               show: true
             });
             });
           }
           }
-
         }
         }
       }
       }
     })
     })
   },
   },
   // 点击同意协议 并且记一下
   // 点击同意协议 并且记一下
   hidePopup() {
   hidePopup() {
-    this.setData({
-      show: false
-    });
-    let sessionKey = "";
-    wx.checkSession({
-      success: () => {
-        sessionKey = wx.getStorageSync('sessionKey');
-        wx.request({
-          url: app.globalData.publicUrl + '/wx/student/verification',
-          method: "post",
-          data: {
-            sessionKey: sessionKey
-          },
-          success: function (res) {
-            console.log(res, "我成功了")
-          }
-        })
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/verification',
+      method: "post",
+      data: {
+        sessionKey: this.data.sessionKey
       },
       },
-      fail() {
-        wx.login({
-          success(res) {
-            let code = res.code
-            wx.request({
-              url: app.globalData.publicUrl + '/wx/user/wx7e7a46e129d6cd0f/login',
-              method: "get",
-              data: {
-                code
-              },
-              success: function (res) {
-                sessionKey = res.data.sessionKey;
-                wx.setStorageSync('sessionKey', res.data.sessionKey);
-                wx.request({
-                  url: app.globalData.publicUrl + '/wx/student/verification',
-                  method: "post",
-                  data: {
-                    sessionKey: sessionKey
-                  },
-                  success: function (res) {
-                    console.log(res, "我成功了")
-                  }
-                })
-              }
-            })
-          }
-        })
+      success: (res) => {
+        this.setData({
+          show: false
+        });
       }
       }
     })
     })
   },
   },
-  // 检查班级群是否加了
+  // 检查班级群是否加了 && 学员登记任务check
   checkTaskList(sessionKey) {
   checkTaskList(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey
+        sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
+          this.setData({
+            studentName: res.data.data.studentName,
+          })
           if (res.data.data.joinClas == 0) {
           if (res.data.data.joinClas == 0) {
             this.setData({
             this.setData({
               istask: true
               istask: true
             })
             })
           }
           }
-          this.setData({
-            studentName: res.data.data.studentName,
-          })
-        }
-      }
-    })
-  },
-  // 学员登记任务check
-  checkTaskList1(sessionKey) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
-      method: "post",
-      data: {
-        sessionKey: sessionKey
-      },
-      success: (res) => {
-        if (res.data.code == 0 && res.data.data.register == 0) {
-          this.setData({
-            istask1: true
-          })
+          if (res.data.data.register == 0) {
+            this.setData({
+              istask1: true
+            })
+          }
         }
         }
       }
       }
     })
     })
@@ -249,7 +205,6 @@ Page({
   },
   },
   // 页面上显示的我的未读通知
   // 页面上显示的我的未读通知
   getMynotice(sessionKey) {
   getMynotice(sessionKey) {
-    // let _this = this;
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/eduNoticeSee/list',
       url: app.globalData.publicUrl + '/wx/eduNoticeSee/list',
       method: "post",
       method: "post",
@@ -270,11 +225,9 @@ Page({
   },
   },
   // 跳转通知页
   // 跳转通知页
   gomyNotice() {
   gomyNotice() {
-    // if (this.data.notice !== "暂无未读通知") {
     wx.navigateTo({
     wx.navigateTo({
       url: '../myNotice/myNotice'
       url: '../myNotice/myNotice'
     })
     })
-    // }
   },
   },
   // 学员登记表
   // 学员登记表
   goWrite() {
   goWrite() {
@@ -304,10 +257,6 @@ Page({
   },
   },
   // 学员名单
   // 学员名单
   toAdd2() {
   toAdd2() {
-    // wx.showModal({
-    //   showCancel: false,
-    //   content: '当前功能暂未开放'
-    // })
     wx.navigateTo({
     wx.navigateTo({
       url: '../studentList/studentList?id=' + this.data.classInfo.id
       url: '../studentList/studentList?id=' + this.data.classInfo.id
     })
     })
@@ -320,7 +269,6 @@ Page({
   },
   },
   // 我的课程
   // 我的课程
   getMycourse(sessionKey) {
   getMycourse(sessionKey) {
-    // let _this = this;
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
       url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
       method: "post",
       method: "post",
@@ -330,13 +278,22 @@ Page({
       success: (res) => {
       success: (res) => {
         this.setData({
         this.setData({
           kcArr: res.data.list,
           kcArr: res.data.list,
-          istask2: res.data.allDone
+          istask2: res.data.allDone,
+          currentName: "",
+          currentId: null
         });
         });
         for (let i = 0; i < res.data.list.length; i++) {
         for (let i = 0; i < res.data.list.length; i++) {
-          if (res.data.list[i].isStudyDone == 0) {
-            this.setData({
-              IngCourseArr: res.data.list[i]
-            })
+          if (res.data.list[i].isLive == -1) {
+            // 这个节课未全部完成
+            if (res.data.list[i].isDone == "0") {
+              // 这个视频已经进行了 看一半或者看完了
+              if (res.data.list[i].isStudyDone == 0 || res.data.list[i].isStudyDone == 1) {
+                this.setData({
+                  currentName: res.data.list[i].courseName,
+                  currentId: res.data.list[i].id
+                })
+              }
+            }
           }
           }
         }
         }
         let result = [];
         let result = [];
@@ -413,48 +370,44 @@ Page({
       return false
       return false
     }
     }
     let id = e.currentTarget.dataset.item.id //此课程的id
     let id = e.currentTarget.dataset.item.id //此课程的id
-    if (this.data.IngCourseArr.length == 0) {
-      if (e.currentTarget.dataset.item.isLive == 1) {
-        if (e.currentTarget.dataset.item.isActive == 1) {
-          wx.navigateTo({
-            url: '../zbDetails/zbDetails?id=' + id
-          })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: "直播还未开始哦"
-          })
-          return false;
-        }
-      } else {
+    // 直播
+    if (e.currentTarget.dataset.item.isLive == 1) {
+      if (e.currentTarget.dataset.item.isActive == 1) {
         wx.navigateTo({
         wx.navigateTo({
-          url: '../dbDetails/dbDetails?id=' + id
+          url: '../zbDetails/zbDetails?id=' + id
         })
         })
+      } else {
+        wx.showModal({
+          showCancel: false,
+          content: "直播还未开始哦"
+        })
+        return false;
       }
       }
     } else {
     } else {
-      if (e.currentTarget.dataset.item.isLive == 1) {
-        if (e.currentTarget.dataset.item.isActive == 1) {
-          wx.navigateTo({
-            url: '../zbDetails/zbDetails?id=' + id
-          })
+      if (this.data.currentId != null) {
+        // 没学或者没学完
+        if (e.currentTarget.dataset.item.isDone == 0) {
+          if (id == this.data.currentId) {
+            wx.navigateTo({
+              url: '../dbDetails/dbDetails?id=' + id
+            })
+          } else {
+            // 有未完成的但不是我 就不能跳转
+            wx.showModal({
+              showCancel: false,
+              content: "您的" + this.data.currentName + "课还未学完,快去学习吧"
+            })
+          }
         } else {
         } else {
-          wx.showModal({
-            showCancel: false,
-            content: "直播还未开始哦"
-          })
-          return false;
-        }
-      } else {
-        if (id == this.data.IngCourseArr.id) {
+          // 我看完了这个视频 还能看
           wx.navigateTo({
           wx.navigateTo({
             url: '../dbDetails/dbDetails?id=' + id
             url: '../dbDetails/dbDetails?id=' + id
           })
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: "您的" + this.data.IngCourseArr.courseName + "课还未学完,快去学习吧"
-          })
         }
         }
+      } else {
+        wx.navigateTo({
+          url: '../dbDetails/dbDetails?id=' + id
+        })
       }
       }
     }
     }
   },
   },
@@ -485,7 +438,7 @@ Page({
     if (isStudyDone != 1) {
     if (isStudyDone != 1) {
       wx.showModal({
       wx.showModal({
         showCancel: false,
         showCancel: false,
-        content: "您的学习课程还未完成哦,请先完成再来考试吧!"
+        content: "您当前的学习课程还未完成哦,请先完成再来考试吧!"
       })
       })
       return false
       return false
     } else {
     } else {
@@ -554,7 +507,6 @@ Page({
         method: "post",
         method: "post",
         data: {
         data: {
           sessionKey: this.data.sessionKey,
           sessionKey: this.data.sessionKey,
-          // questSub: '3',
           courseId: e.currentTarget.dataset.item.id,
           courseId: e.currentTarget.dataset.item.id,
           clasId: this.data.classInfo.id
           clasId: this.data.classInfo.id
         },
         },
@@ -589,7 +541,6 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
           answersId: e.currentTarget.dataset.item.isExamId
         },
         },
         success: (res) => {
         success: (res) => {
-          console.log(res.data.list[0].answerScore)
           if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
           if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
             wx.navigateTo({
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
@@ -600,6 +551,12 @@ Page({
               content: '当前老师批阅中,请耐心等待'
               content: '当前老师批阅中,请耐心等待'
             })
             })
           }
           }
+        },
+        fail: () => {
+          wx.showModal({
+            showCancel: false,
+            content: '当前老师批阅中,请耐心等待'
+          })
         }
         }
       })
       })
     }
     }
@@ -641,7 +598,6 @@ Page({
         clasId: this.data.classInfo.id
         clasId: this.data.classInfo.id
       },
       },
       success: (res) => {
       success: (res) => {
-        console.log(res,"999999999999999999")
         if (res.data.code == 0) {
         if (res.data.code == 0) {
           if (res.data.list.length == 0) {
           if (res.data.list.length == 0) {
             wx.showModal({
             wx.showModal({
@@ -658,7 +614,6 @@ Page({
                     answersId: res.data.list[0].answersId
                     answersId: res.data.list[0].answersId
                   },
                   },
                   success: (res1) => {
                   success: (res1) => {
-                    console.log(res1,"0000000000000")
                     if (res1.data.list[0].answerScore >= 0 && res1.data.list[0].answerScore != null) {
                     if (res1.data.list[0].answerScore >= 0 && res1.data.list[0].answerScore != null) {
                       wx.navigateTo({
                       wx.navigateTo({
                         url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
                         url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
@@ -866,8 +821,5 @@ Page({
       sessionKey
       sessionKey
     });
     });
     this.isRz(sessionKey)
     this.isRz(sessionKey)
-    this.getMycourse(sessionKey);
-    this.getMynotice(sessionKey);
-    this.checkTaskList1(sessionKey);
   }
   }
 })
 })

+ 87 - 8
pages/myClass/myClass.wxml

@@ -1,8 +1,88 @@
 <view class="container">
 <view class="container">
 	<van-popup show="{{ show }}" bind:close="onClose">
 	<van-popup show="{{ show }}" bind:close="onClose">
 		<view class="nr_box">
 		<view class="nr_box">
-			<view class="title">学员培训协议</view>
-			<view class="zw">感谢您信任并使用在线学习教育培训系统,在您使用我的班级之前,请认真阅读<text style="color:red">《学员培训协议》</text>的全部内容,以了解学员权利和个人信息处理规则,感谢您的配合。</view>
+			<view class="title">学员须知</view>
+			<view class="zw">
+				<view class="dl">欢迎您来到吉林长春社区干部学院,我们将为您开
+					启一次温馨难忘、受益良多的学习与心灵之旅。现就有
+					关事宜提示如下:</view>
+				<view class="dl">一、注意事项</view>
+				<view class="dl">★“一码通”使用说明:学员报到前,请在手机微
+					信上直接搜索“吉林长春社区干部学院”微信公众号,
+					或通过手机微信扫一扫“吉林长春社区干部学院微信公
+					众号二维码”关注吉林长春社区干部学院微信公众号。</view>
+				<image src="../../images/ewm.jpg" class="ewm"></image>
+				<view class="ermname">吉林长春社区干部学院微信公众号二维码</view>
+				<view class="dl">操作流程:</view>
+				<view class="dl">学员绑定:点击公众号 ->学员服务 ->电子门禁进入,
+					填写学员姓名,身份证号进行学员绑定。</view>
+				<view class="dl">学员进出:点击公众号 -> 学员服务 -> 电子门禁,
+					显示门禁码,在设备上扫码进出学院。</view>
+				<view class="dl">学员报到、上下课签到、就餐等需要在工作人员的
+					引导下使用微信扫描二维码。</view>
+				<view class="dl">★培训期间请自觉遵守中组部关于加强学员管理“九
+					条规定”,严守学习纪律,不迟到、不早退、不旷课。
+					如有特殊情况须向带队领导请假,并告知项目秘书。</view>
+				<view class="dl">
+					★请认真阅读日程安排,了解每日教学安排(时间、
+					地点和课程等),若有变动,以项目秘书通知为准。请
+					提前 10 分钟到达指定教室并扫描二维码签到,请将手机
+					调为静音或震动状态,切勿随意走动、接听电话。
+				</view>
+				<view class="dl">
+					★现场教学时间:具体时间和乘车地点等事宜以通
+					知为准。外出学习期间请注意安全,遵守现场教学秩序,
+					请勿单独活动或擅自离队。
+				</view>
+				<view class="dl">
+					★禁止在教室、餐厅等公共场所吸烟,请爱护公共
+					财物,如有损坏折价赔偿;请勿私自外接电源,离开房
+					间前请关闭电源。
+				</view>
+				<view class="dl">
+					★学院书吧、茶吧提供的自学书刊请勿带走,阅读
+					完成后请及时归还书吧或放回原处。
+				</view>
+				<view class="dl">
+					★培训期间请保管好个人贵重物品。
+				</view>
+				<view class="dl">二、服务指南</view>
+				<view class="dl">★用餐服务:</view>
+				<view class="dl">1. 早餐时间:7:00</view>
+				<view class="dl">用餐地点:学院副楼三楼餐厅;广源宾馆二楼餐厅。</view>
+				<view class="dl">2. 午餐时间:11:30 晚餐时间:17:00</view>
+				<view class="dl">用餐地点:学院副楼三楼餐厅。</view>
+				<view class="dl">自助餐、工作餐均备有清真菜品。</view>
+				<view class="dl">★住宿服务:</view>
+				<view class="dl">1. 吉林长春社区干部学院(地址:吉林省长春市宽城
+					区团山街 1777号)。总台电话:0431-80793833,8001(内线);
+					房间通话:8+ 房间号。
+					免费上网:教学区(1-3 楼):密码 12345678;
+					客 房(4-5 楼):密码 00000000。</view>
+				<view class="dl">2. 广源宾馆(地址:吉林省长春市宽城区凯旋路 2788
+					号)。总台电话:0431-82937223,0431-81096677,8666(内
+					线),8777(内线);房间通话:2+ 房间号。</view>
+				<view class="dl">免费上网:GuanYuan HOTEL, 无密码</view>
+				<view class="dl">学院、宾馆均 24 小时提供冷水、热水。</view>
+				<view class="dl">返程时请到一楼服务台办理退房手续。</view>
+				<view class="dl">★文体服务:</view>
+				<view class="dl">学院配有书吧、茶吧、体育馆等服务设施。开放时间:
+					早 6:30 至晚 9:00。</view>
+				<view class="dl">★医务服务:学院配有医疗箱用于简单医疗救助,学
+					院周边有长山社区卫生服务中心、吉林省胜利医院,如有
+					需要请联系项目秘书就近就医。</view>
+				<view class="dl">★公交路线:</view>
+				<view class="dl">1. 吉林长春社区干部学院</view>
+				<view class="dl">10 路:长春市轮胎厂 -- 千山路(学院附近)-- 长春站</view>
+				<view class="dl">11 路:劳模会馆(学院附近)-- 地铁 1 号线(北人民
+					大街站)-- 长春站</view>
+				<view class="dl">21路:八里堡 --团山街(学院附近)--地铁 1号线(北
+					环城路站)-- 雁鸣湖山庄</view>
+				<view class="dl">2. 广源宾馆:</view>
+				<view class="dl">2 路:雁鸣湖山庄 -- 吉林工师(宾馆附近)-- 长春站</view>
+				<view class="dl">113 路:小南街 -- 凯旋花园(宾馆附近)-- 长春站</view>
+				<view class="dl">273 路:杜家屯 -- 吉林工师(宾馆附近)-- 人民广场</view>
+			</view>
 			<view class="agree_text">点击按钮即表示同意<text style="color:red">《学员培训协议》</text></view>
 			<view class="agree_text">点击按钮即表示同意<text style="color:red">《学员培训协议》</text></view>
 			<view class="agree_btn" bindtap="hidePopup">同意协议并进入我的班级</view>
 			<view class="agree_btn" bindtap="hidePopup">同意协议并进入我的班级</view>
 			<view class="thinking">我再想想</view>
 			<view class="thinking">我再想想</view>
@@ -27,12 +107,12 @@
 		<view class="layout_text2" wx:else>去填写</view>
 		<view class="layout_text2" wx:else>去填写</view>
 	</view>
 	</view>
 	<view class="introuduce">
 	<view class="introuduce">
-	<view bindtap="toAdd1">学院介绍</view>|
-	<view bindtap="toAdd2">学员名单</view>|
-	<view bindtap="toAdd3">项目组名单</view>
+		<view bindtap="toAdd1">学院介绍</view>|
+		<view bindtap="toAdd2">学员名单</view>|
+		<view bindtap="toAdd3">项目组名单</view>
 	</view>
 	</view>
 	<view class="{{!showMore? 'hiddenmore' : 'showmore'}}">
 	<view class="{{!showMore? 'hiddenmore' : 'showmore'}}">
-		<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
+		<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
 			<image src='{{item.courseImg}}' mode="aspectFill" class="spfm"></image>
 			<image src='{{item.courseImg}}' mode="aspectFill" class="spfm"></image>
 			<image src='{{item.isDone==0||item.isDone==null?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 			<image src='{{item.isDone==0||item.isDone==null?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 			<view class="sp_text">
 			<view class="sp_text">
@@ -61,7 +141,6 @@
 			</view>
 			</view>
 			<view wx:else class='openall' bindtap='listToggle'>
 			<view wx:else class='openall' bindtap='listToggle'>
 				展开全部
 				展开全部
-				<!-- <van-icon name="arrow-down" /> -->
 				<image src='/images/openall.png' mode='aspectFill' class="openallimg"></image>
 				<image src='/images/openall.png' mode='aspectFill' class="openallimg"></image>
 			</view>
 			</view>
 		</block>
 		</block>
@@ -83,7 +162,7 @@
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="pz">注:领取结业证需完成所有课程</view>
 		<view class="pz">注:领取结业证需完成所有课程</view>
 	</view>
 	</view>
-	<view wx:if="{{ showzs }}" style="position:absolute;bottom:0;height:100vh;width:100%;background-color:rgba(13,13,13,0.7)">
+	<view wx:if="{{ showzs }}" style="position:fixed;bottom:0;height:100vh;width:100%;background-color:rgba(13,13,13,0.7)">
 		<canvas canvas-id="{{myCanvasId}}" style="width:300px;height:415px;margin:100rpx auto 30rpx auto"></canvas>
 		<canvas canvas-id="{{myCanvasId}}" style="width:300px;height:415px;margin:100rpx auto 30rpx auto"></canvas>
 		<button bindtap="saveZs" size="mini" type="default" style="color:#000;font-size:14px;margin-left:200rpx;">保存证书</button>
 		<button bindtap="saveZs" size="mini" type="default" style="color:#000;font-size:14px;margin-left:200rpx;">保存证书</button>
 		<button bindtap="onClose1" size="mini" type="default" style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>
 		<button bindtap="onClose1" size="mini" type="default" style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>

+ 22 - 10
pages/myClass/myClass.wxss

@@ -8,11 +8,10 @@
 
 
 .title {
 .title {
   margin-left: 245rpx;
   margin-left: 245rpx;
-  padding-top: 60rpx;
+  padding-top: 30rpx;
   font-size: 35rpx;
   font-size: 35rpx;
   font-weight: 900;
   font-weight: 900;
-  margin-bottom: 80rpx;
-
+  margin-bottom: 30rpx;
 }
 }
 
 
 .introuduce {
 .introuduce {
@@ -25,6 +24,7 @@
   display: flex;
   display: flex;
   line-height: 70rpx;
   line-height: 70rpx;
   font-size: 25rpx;
   font-size: 25rpx;
+  
 }
 }
 .banjihz {
 .banjihz {
   width: 57rpx;
   width: 57rpx;
@@ -34,14 +34,26 @@
 }
 }
 
 
 .zw {
 .zw {
-  padding-left: 50rpx;
-  padding-right: 50rpx;
-  text-indent: 60rpx;
-  font-size: 30rpx;
-  line-height: 50rpx;
-  height: 50vh;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  /* text-indent: 20rpx; */
+  font-size: 26rpx;
+  line-height: 40rpx;
+  height: 60vh;
+  /* border: 1px solid red; */
+  overflow-y: auto;
+}
+.dl{
+  text-indent: 56rpx;
+}
+.ewm{
+  width: 300rpx;
+  height: 300rpx;
+  margin-left: 160rpx;
+}
+.ermname{
+  margin-left: 50rpx;
 }
 }
-
 /* .cloudimg{
 /* .cloudimg{
   width: 733rpx;
   width: 733rpx;
   height: 220rpx; 
   height: 220rpx; 

+ 0 - 5
pages/myInteractions/myInteractions.wxss

@@ -1,13 +1,11 @@
 .tab_box {
 .tab_box {
   width: 100%;
   width: 100%;
   height: 150rpx;
   height: 150rpx;
-  /* border: 1px solid red; */
   display: flex;
   display: flex;
 }
 }
 
 
 .tab1 {
 .tab1 {
   width: 49%;
   width: 49%;
-  /* border: 1px solid red; */
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;
@@ -16,7 +14,6 @@
 
 
 .tab2 {
 .tab2 {
   width: 49%;
   width: 49%;
-  /* border: 1px solid red; */
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;
@@ -58,8 +55,6 @@
   margin-left: 5%;
   margin-left: 5%;
   margin-top: 50rpx;
   margin-top: 50rpx;
   font-size: 28rpx;
   font-size: 28rpx;
-  /* display: flex; */
-  /* border: 1px solid red; */
 }
 }
 
 
 .tip {
 .tip {

+ 118 - 251
pages/myMission/myMission.js

@@ -4,6 +4,7 @@ Page({
   data: {
   data: {
     showewm: false, //是否显示班级群二维码
     showewm: false, //是否显示班级群二维码
     showzs: false, //是否显示毕业证书
     showzs: false, //是否显示毕业证书
+    show: false, //协议显示
     kcArr: [], //课程列表
     kcArr: [], //课程列表
     sfmArr: [], //课程的时间换算成(时分秒)
     sfmArr: [], //课程的时间换算成(时分秒)
     istask1: false, //第一个任务加入班级群
     istask1: false, //第一个任务加入班级群
@@ -16,9 +17,11 @@ Page({
     classInfo: {}, //有关我这个班级的所有信息
     classInfo: {}, //有关我这个班级的所有信息
     byzsbj: "../../images/zsbj.jpg", //毕业证书的背景 用于合成图片
     byzsbj: "../../images/zsbj.jpg", //毕业证书的背景 用于合成图片
     myCanvasId: 0, //画布的id 再次绘制不成功的原因是id不能一致  所以id为变量++
     myCanvasId: 0, //画布的id 再次绘制不成功的原因是id不能一致  所以id为变量++
-    IngCourseArr: [] //如果有正在进行的课就存一下
+    IngCourseArr: [], //如果有正在进行的课就存一下
+    currentId: null,
+    currentName: ""
   },
   },
-  // 检查第一个任务 班级二维码是否点击
+  // 检查第一个任务 班级二维码是否点击 && 检查第二个任务 学员登记表  &&   第六个任务 领取结业证
   checkTaskList(sessionKey) {
   checkTaskList(sessionKey) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
       url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
@@ -28,110 +31,29 @@ Page({
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
+          this.setData({
+            studentName: res.data.data.studentName,
+          })
           if (res.data.data.joinClas == 0) {
           if (res.data.data.joinClas == 0) {
             this.setData({
             this.setData({
               istask1: true
               istask1: true
             })
             })
           }
           }
-          this.setData({
-            studentName: res.data.data.studentName,
-          })
+          if (res.data.data.register == 0) {
+            this.setData({
+              istask2: true
+            })
+          }
+          if (res.data.data.graduation == 0) {
+            this.setData({
+              istask6: true
+            })
+          }
         }
         }
       }
       }
     })
     })
   },
   },
   //保存班级二维码
   //保存班级二维码
-  saveImg() {
-    wx.getSetting({
-      success: (res) => {
-        if (!res.authSetting['scope.writePhotosAlbum']) {
-          wx.authorize({
-            scope: 'scope.writePhotosAlbum',
-            success() {
-              wx.showLoading({
-                title: '保存中...'
-              })
-              let imgSrc = this.data.classInfo.codeImg;
-              wx.downloadFile({
-                url: imgSrc,
-                success: function (res) {
-                  //图片保存到本地
-                  wx.saveImageToPhotosAlbum({
-                    filePath: res.tempFilePath,
-                    success: function (data) {
-                      wx.hideLoading();
-                      wx.showToast({
-                        title: '保存成功',
-                        icon: 'success',
-                        duration: 2000
-                      })
-                    },
-                    fail: function (err) {
-                      wx.hideLoading();
-                      if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
-                        wx.openSetting({
-                          success(settingdata) {
-                            if (settingdata.authSetting['scope.writePhotosAlbum']) {
-                              console.log('获取权限成功,给出再次点击图片保存到相册的提示。')
-                            } else {
-                              console.log('获取权限失败,给出不给权限就无法正常使用的提示')
-                            }
-                          }
-                        })
-                      }
-                    },
-                    complete(res) {
-                      console.log(res);
-                    }
-                  })
-                }
-              })
-            }
-          })
-        } else {
-          wx.showLoading({
-            title: '保存中...'
-          })
-          let imgSrc = this.data.classInfo.codeImg
-          wx.downloadFile({
-            url: imgSrc,
-            success: function (res) {
-              wx.hideLoading();
-              wx.saveImageToPhotosAlbum({
-                filePath: res.tempFilePath,
-                success: function (data) {
-                  wx.hideLoading();
-                  wx.showToast({
-                    title: '保存成功',
-                    icon: 'success',
-                    duration: 2000
-                  })
-                },
-                fail: function (err) {
-                  wx.hideLoading();
-                  if (err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
-                    console.log("当初用户拒绝,再次发起授权")
-                    wx.openSetting({
-                      success(settingdata) {
-                        if (settingdata.authSetting['scope.writePhotosAlbum']) {
-                          console.log('获取权限成功,给出再次点击图片保存到相册的提示。')
-                        } else {
-                          console.log('获取权限失败,给出不给权限就无法正常使用的提示')
-                        }
-                      }
-                    })
-                  }
-                },
-                complete(res) {
-                  console.log(res);
-                }
-              })
-            }
-          })
-        }
-      }
-    })
-  },
   saveImg() {
   saveImg() {
     wx.showLoading({
     wx.showLoading({
       title: '保存中...'
       title: '保存中...'
@@ -142,7 +64,7 @@ Page({
         //图片保存到本地
         //图片保存到本地
         wx.saveImageToPhotosAlbum({
         wx.saveImageToPhotosAlbum({
           filePath: res.tempFilePath,
           filePath: res.tempFilePath,
-          success: function (data) {
+          success: () => {
             wx.hideLoading()
             wx.hideLoading()
             wx.showModal({
             wx.showModal({
               title: '提示',
               title: '提示',
@@ -150,17 +72,16 @@ Page({
               showCancel: false,
               showCancel: false,
             })
             })
           },
           },
-          fail: function (err) {
+          fail: (err) => {
             if (err.errMsg === "saveImageToPhotosAlbum:fail:auth denied" || err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
             if (err.errMsg === "saveImageToPhotosAlbum:fail:auth denied" || err.errMsg === "saveImageToPhotosAlbum:fail auth deny") {
-              // 这边微信做过调整,必须要在按钮中触发,因此需要在弹框回调中进行调用
               wx.showModal({
               wx.showModal({
                 title: '提示',
                 title: '提示',
                 content: '需要您授权保存相册',
                 content: '需要您授权保存相册',
                 showCancel: false,
                 showCancel: false,
-                success: modalSuccess => {
+                success: () => {
+                  wx.hideLoading()
                   wx.openSetting({
                   wx.openSetting({
                     success(settingdata) {
                     success(settingdata) {
-                      console.log("settingdata", settingdata)
                       if (settingdata.authSetting['scope.writePhotosAlbum']) {
                       if (settingdata.authSetting['scope.writePhotosAlbum']) {
                         wx.showModal({
                         wx.showModal({
                           title: '提示',
                           title: '提示',
@@ -190,23 +111,14 @@ Page({
             wx.hideLoading()
             wx.hideLoading()
           }
           }
         })
         })
-      }
-    })
-  },
-  // 检查第二个任务 学员登记表
-  checkTaskList2(sessionKey) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
-      method: "post",
-      data: {
-        sessionKey: sessionKey
       },
       },
-      success: (res) => {
-        if (res.data.code == 0 && res.data.data.register == 0) {
-          this.setData({
-            istask2: true
-          })
-        }
+      fail: () => {
+        wx.hideLoading()
+        wx.showModal({
+          title: '提示',
+          content: '下载失败',
+          showCancel: false,
+        })
       }
       }
     })
     })
   },
   },
@@ -246,23 +158,6 @@ Page({
       }
       }
     })
     })
   },
   },
-  //第六个任务 领取结业证
-  checkTaskList6(sessionKey) {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
-      method: "post",
-      data: {
-        sessionKey: sessionKey
-      },
-      success: (res) => {
-        if (res.data.code == 0 && res.data.data.graduation == 0) {
-          this.setData({
-            istask6: true
-          })
-        }
-      }
-    })
-  },
   // 是否认证
   // 是否认证
   isRz(sessionKey) {
   isRz(sessionKey) {
     wx.request({
     wx.request({
@@ -272,22 +167,8 @@ Page({
         sessionKey: sessionKey
         sessionKey: sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
-        if (res.data.code == 0) {
-          if (res.data.data !== null || res.data.data !== "") {
-            this.isClass(sessionKey)
-          } else {
-            wx.showModal({
-              content: "您还没有进行身份认证哦",
-              showCancel: false,
-              success(res) {
-                if (res.confirm) {
-                  wx.redirectTo({
-                    url: '../Identity/Identity'
-                  })
-                }
-              }
-            })
-          }
+        if (res.data.code == 0 && (res.data.data !== null || res.data.data !== "")) {
+          this.isClass(sessionKey)
         } else {
         } else {
           wx.showModal({
           wx.showModal({
             content: "您还没有进行身份认证哦",
             content: "您还没有进行身份认证哦",
@@ -317,6 +198,9 @@ Page({
           this.setData({
           this.setData({
             classInfo: res.data.data
             classInfo: res.data.data
           })
           })
+          this.isAgree(sessionKey);
+          this.getMycourse(sessionKey);
+          this.checkTaskList(sessionKey);
           this.checkTaskList4(sessionKey, res.data.data.id)
           this.checkTaskList4(sessionKey, res.data.data.id)
           this.checkTaskList5(sessionKey, res.data.data.id)
           this.checkTaskList5(sessionKey, res.data.data.id)
         } else {
         } else {
@@ -336,6 +220,46 @@ Page({
       }
       }
     })
     })
   },
   },
+  // 协议是否已同意  
+  isAgree(sessionKey) {
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/selStudentSessionKey',
+      method: "post",
+      data: {
+        sessionKey
+      },
+      success: (res) => {
+        if (res.data.code == 0 && res.data.data) {
+          if (res.data.data.agreement == 0) {
+            this.setData({
+              studentName: res.data.data.studentName,
+              show: false
+            });
+          } else {
+            this.setData({
+              studentName: res.data.data.studentName,
+              show: true
+            });
+          }
+        }
+      }
+    })
+  },
+  // 点击同意协议 并且记一下
+  hidePopup() {
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/verification',
+      method: "post",
+      data: {
+        sessionKey: this.data.sessionKey
+      },
+      success: (res) => {
+        this.setData({
+          show: false
+        });
+      }
+    })
+  },
   // 获取我的课程表
   // 获取我的课程表
   getMycourse(sessionKey) {
   getMycourse(sessionKey) {
     wx.request({
     wx.request({
@@ -348,14 +272,23 @@ Page({
         if (res.data.code == 0 && res.data.list.length !== 0) {
         if (res.data.code == 0 && res.data.list.length !== 0) {
           this.setData({
           this.setData({
             kcArr: res.data.list,
             kcArr: res.data.list,
-            istask3: res.data.allDone
+            istask3: res.data.allDone,
+            currentName: "",
+            currentId: null
           });
           });
           // 过滤数组
           // 过滤数组
           for (let i = 0; i < res.data.list.length; i++) {
           for (let i = 0; i < res.data.list.length; i++) {
-            if (res.data.list[i].isStudyDone == 0) {
-              this.setData({
-                IngCourseArr: res.data.list[i]
-              })
+            // 这个节课未全部完成
+            if (res.data.list[i].isLive == -1) {
+              if (res.data.list[i].isDone == 0) {
+                // 这个视频已经进行了 看一半或者看完了
+                if (res.data.list[i].isStudyDone == 0 || res.data.list[i].isStudyDone == 1) {
+                  this.setData({
+                    currentName: res.data.list[i].courseName,
+                    currentId: res.data.list[i].id
+                  })
+                }
+              }
             }
             }
           }
           }
           // 换算时间
           // 换算时间
@@ -430,48 +363,44 @@ Page({
       return false
       return false
     }
     }
     let id = e.currentTarget.dataset.item.id //此课程的id
     let id = e.currentTarget.dataset.item.id //此课程的id
-    if (this.data.IngCourseArr.length == 0) {
-      if (e.currentTarget.dataset.item.isLive == 1) {
-        if (e.currentTarget.dataset.item.isActive == 1) {
-          wx.navigateTo({
-            url: '../zbDetails/zbDetails?id=' + id
-          })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: "直播还未开始哦"
-          })
-          return false;
-        }
-      } else {
+    // 直播
+    if (e.currentTarget.dataset.item.isLive == 1) {
+      if (e.currentTarget.dataset.item.isActive == 1) {
         wx.navigateTo({
         wx.navigateTo({
-          url: '../dbDetails/dbDetails?id=' + id
+          url: '../zbDetails/zbDetails?id=' + id
         })
         })
+      } else {
+        wx.showModal({
+          showCancel: false,
+          content: "直播还未开始哦"
+        })
+        return false;
       }
       }
     } else {
     } else {
-      if (e.currentTarget.dataset.item.isLive == 1) {
-        if (e.currentTarget.dataset.item.isActive == 1) {
-          wx.navigateTo({
-            url: '../zbDetails/zbDetails?id=' + id
-          })
+      if (this.data.currentId != null) {
+        // 没学或者没学完
+        if (e.currentTarget.dataset.item.isDone == 0) {
+          if (id == this.data.currentId) {
+            wx.navigateTo({
+              url: '../dbDetails/dbDetails?id=' + id
+            })
+          } else {
+            // 有未完成的但不是我 就不能跳转
+            wx.showModal({
+              showCancel: false,
+              content: "您的" + this.data.currentName + "课还未学完,快去学习吧"
+            })
+          }
         } else {
         } else {
-          wx.showModal({
-            showCancel: false,
-            content: "直播还未开始哦"
-          })
-          return false;
-        }
-      } else {
-        if (id == this.data.IngCourseArr.id) {
+          // 我看完了这个视频 还能看
           wx.navigateTo({
           wx.navigateTo({
             url: '../dbDetails/dbDetails?id=' + id
             url: '../dbDetails/dbDetails?id=' + id
           })
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: "您的" + this.data.IngCourseArr.courseName + "课还未学完,快去学习吧"
-          })
         }
         }
+      } else {
+        wx.navigateTo({
+          url: '../dbDetails/dbDetails?id=' + id
+        })
       }
       }
     }
     }
   },
   },
@@ -488,7 +417,7 @@ Page({
     if (isStudyDone != 1) {
     if (isStudyDone != 1) {
       wx.showModal({
       wx.showModal({
         showCancel: false,
         showCancel: false,
-        content: "您的学习课程还未完成哦,请先完成学习任务后再来考试吧!"
+        content: "您当前的学习课程还未完成哦,请先完成再来考试吧!"
       })
       })
       return false
       return false
     } else {
     } else {
@@ -570,63 +499,6 @@ Page({
     }
     }
   },
   },
   // 期末考试
   // 期末考试
-  // goQmks() {
-  //   if (!this.data.istask3) {
-  //     wx.showModal({
-  //       showCancel: false,
-  //       content: "请先完成所有的课程再来期末考试吧!"
-  //     })
-  //     return false
-  //   }
-  //   wx.request({
-  //     url: app.globalData.publicUrl + '/wx/exam/examList',
-  //     method: "post",
-  //     data: {
-  //       sessionKey: this.data.sessionKey,
-  //       clasId: this.data.classInfo.id
-  //     },
-  //     success: (res) => {
-  //       if (res.data.code == 0) {
-  //         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.request({
-  //                   url: app.globalData.publicUrl + '/wx/answer/detail',
-  //                   method: "post",
-  //                   data: {
-  //                     answersId: res.data.list[0].answersId
-  //                   },
-  //                   success: (res1) => {
-  //                     if (res1.data.list[0].answerScore) {
-  //                       wx.navigateTo({
-  //                         url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
-  //                       })
-  //                     } else {
-  //                       wx.showModal({
-  //                         showCancel: false,
-  //                         content: '当前老师批阅中,请耐心等待'
-  //                       })
-  //                     }
-  //                   }
-  //                 })
-  //               } else {
-  //                 this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
-  //               }
-  //             } else {
-  //               this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
-  //             }
-  //           }
-  //         }
-  //       }
-  //     }
-  //   })
-  // },
   goQmks() {
   goQmks() {
     if (!this.data.istask1) {
     if (!this.data.istask1) {
       wx.showModal({
       wx.showModal({
@@ -865,7 +737,6 @@ Page({
           answersId: e.currentTarget.dataset.item.isExamId
           answersId: e.currentTarget.dataset.item.isExamId
         },
         },
         success: (res) => {
         success: (res) => {
-          console.log(res.data.list[0].answerScore)
           if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
           if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
             wx.navigateTo({
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
               url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
@@ -892,9 +763,5 @@ Page({
       sessionKey
       sessionKey
     })
     })
     this.isRz(sessionKey);
     this.isRz(sessionKey);
-    this.getMycourse(sessionKey);
-    this.checkTaskList(sessionKey)
-    this.checkTaskList2(sessionKey)
-    this.checkTaskList6(sessionKey)
   }
   }
 })
 })

+ 91 - 2
pages/myMission/myMission.wxml

@@ -1,4 +1,93 @@
 <view class="container">
 <view class="container">
+	<van-popup show="{{ show }}" bind:close="onClose">
+		<view class="nr_box">
+			<view class="title">学员须知</view>
+			<view class="zw">
+				<view class="dl">欢迎您来到吉林长春社区干部学院,我们将为您开
+					启一次温馨难忘、受益良多的学习与心灵之旅。现就有
+					关事宜提示如下:</view>
+				<view class="dl">一、注意事项</view>
+				<view class="dl">★“一码通”使用说明:学员报到前,请在手机微
+					信上直接搜索“吉林长春社区干部学院”微信公众号,
+					或通过手机微信扫一扫“吉林长春社区干部学院微信公
+					众号二维码”关注吉林长春社区干部学院微信公众号。</view>
+				<image src="../../images/ewm.jpg" class="ewm"></image>
+				<view class="ermname">吉林长春社区干部学院微信公众号二维码</view>
+				<view class="dl">操作流程:</view>
+				<view class="dl">学员绑定:点击公众号 ->学员服务 ->电子门禁进入,
+					填写学员姓名,身份证号进行学员绑定。</view>
+				<view class="dl">学员进出:点击公众号 -> 学员服务 -> 电子门禁,
+					显示门禁码,在设备上扫码进出学院。</view>
+				<view class="dl">学员报到、上下课签到、就餐等需要在工作人员的
+					引导下使用微信扫描二维码。</view>
+				<view class="dl">★培训期间请自觉遵守中组部关于加强学员管理“九
+					条规定”,严守学习纪律,不迟到、不早退、不旷课。
+					如有特殊情况须向带队领导请假,并告知项目秘书。</view>
+				<view class="dl">
+					★请认真阅读日程安排,了解每日教学安排(时间、
+					地点和课程等),若有变动,以项目秘书通知为准。请
+					提前 10 分钟到达指定教室并扫描二维码签到,请将手机
+					调为静音或震动状态,切勿随意走动、接听电话。
+				</view>
+				<view class="dl">
+					★现场教学时间:具体时间和乘车地点等事宜以通
+					知为准。外出学习期间请注意安全,遵守现场教学秩序,
+					请勿单独活动或擅自离队。
+				</view>
+				<view class="dl">
+					★禁止在教室、餐厅等公共场所吸烟,请爱护公共
+					财物,如有损坏折价赔偿;请勿私自外接电源,离开房
+					间前请关闭电源。
+				</view>
+				<view class="dl">
+					★学院书吧、茶吧提供的自学书刊请勿带走,阅读
+					完成后请及时归还书吧或放回原处。
+				</view>
+				<view class="dl">
+					★培训期间请保管好个人贵重物品。
+				</view>
+				<view class="dl">二、服务指南</view>
+				<view class="dl">★用餐服务:</view>
+				<view class="dl">1. 早餐时间:7:00</view>
+				<view class="dl">用餐地点:学院副楼三楼餐厅;广源宾馆二楼餐厅。</view>
+				<view class="dl">2. 午餐时间:11:30 晚餐时间:17:00</view>
+				<view class="dl">用餐地点:学院副楼三楼餐厅。</view>
+				<view class="dl">自助餐、工作餐均备有清真菜品。</view>
+				<view class="dl">★住宿服务:</view>
+				<view class="dl">1. 吉林长春社区干部学院(地址:吉林省长春市宽城
+					区团山街 1777号)。总台电话:0431-80793833,8001(内线);
+					房间通话:8+ 房间号。
+					免费上网:教学区(1-3 楼):密码 12345678;
+					客 房(4-5 楼):密码 00000000。</view>
+				<view class="dl">2. 广源宾馆(地址:吉林省长春市宽城区凯旋路 2788
+					号)。总台电话:0431-82937223,0431-81096677,8666(内
+					线),8777(内线);房间通话:2+ 房间号。</view>
+				<view class="dl">免费上网:GuanYuan HOTEL, 无密码</view>
+				<view class="dl">学院、宾馆均 24 小时提供冷水、热水。</view>
+				<view class="dl">返程时请到一楼服务台办理退房手续。</view>
+				<view class="dl">★文体服务:</view>
+				<view class="dl">学院配有书吧、茶吧、体育馆等服务设施。开放时间:
+					早 6:30 至晚 9:00。</view>
+				<view class="dl">★医务服务:学院配有医疗箱用于简单医疗救助,学
+					院周边有长山社区卫生服务中心、吉林省胜利医院,如有
+					需要请联系项目秘书就近就医。</view>
+				<view class="dl">★公交路线:</view>
+				<view class="dl">1. 吉林长春社区干部学院</view>
+				<view class="dl">10 路:长春市轮胎厂 -- 千山路(学院附近)-- 长春站</view>
+				<view class="dl">11 路:劳模会馆(学院附近)-- 地铁 1 号线(北人民
+					大街站)-- 长春站</view>
+				<view class="dl">21路:八里堡 --团山街(学院附近)--地铁 1号线(北
+					环城路站)-- 雁鸣湖山庄</view>
+				<view class="dl">2. 广源宾馆:</view>
+				<view class="dl">2 路:雁鸣湖山庄 -- 吉林工师(宾馆附近)-- 长春站</view>
+				<view class="dl">113 路:小南街 -- 凯旋花园(宾馆附近)-- 长春站</view>
+				<view class="dl">273 路:杜家屯 -- 吉林工师(宾馆附近)-- 人民广场</view>
+			</view>
+			<view class="agree_text">点击按钮即表示同意<text style="color:red">《学员培训协议》</text></view>
+			<view class="agree_btn" bindtap="hidePopup">同意协议并进入我的班级</view>
+			<view class="thinking">我再想想</view>
+		</view>
+	</van-popup>
 	<view class="step" style="margin-top:20rpx">
 	<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>
 		<image src='{{istask1==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="whitebj">
 		<view class="whitebj">
@@ -30,7 +119,7 @@
 	<view class="step">
 	<view class="step">
 		<image src='{{istask3==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<image src='{{istask3==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
 		<view class="sp_bigbox">
 		<view class="sp_bigbox">
-			<view class="sp" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
+			<view class="sp" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
 				<image src='{{item.isDone==0||item.isDone==null?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 				<image src='{{item.isDone==0||item.isDone==null?"/images/unfinish.png":"/images/finish.png"}}' mode='aspectFill' class="isfinish"></image>
 				<view class="sp_text">
 				<view class="sp_text">
 					<view class="fisrt_set">
 					<view class="fisrt_set">
@@ -69,7 +158,7 @@
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="lq_btn" bindtap="lq">领取结业证</view>
 		<view class="pz">注:领取结业证需完成所有课程</view>
 		<view class="pz">注:领取结业证需完成所有课程</view>
 	</view>
 	</view>
-	<view wx:if="{{ showzs }}" style="position:absolute;bottom:0;height:100vh;width:100%;background-color:rgba(13,13,13,0.7)">
+	<view wx:if="{{ showzs }}" style="position:fixed;bottom:0;height:100vh;width:100%;background-color:rgba(13,13,13,0.7)">
 		<canvas canvas-id="{{myCanvasId}}" style="width:300px;height:415px;margin:100rpx auto 30rpx auto"></canvas>
 		<canvas canvas-id="{{myCanvasId}}" style="width:300px;height:415px;margin:100rpx auto 30rpx auto"></canvas>
 		<button bindtap="saveZs" size="mini" type="default" style="color:#000;font-size:14px;margin-left:200rpx;">保存证书</button>
 		<button bindtap="saveZs" size="mini" type="default" style="color:#000;font-size:14px;margin-left:200rpx;">保存证书</button>
 		<button bindtap="onClose1" size="mini" type="default" style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>
 		<button bindtap="onClose1" size="mini" type="default" style="color:#000;font-size:14px;margin-left:20rpx;">关闭证书</button>

+ 81 - 0
pages/myMission/myMission.wxss

@@ -1,3 +1,84 @@
+.nr_box {
+  width: 670rpx;
+  height: 90vh;
+  background-color: #fff;
+  text-align: left;
+  position: relative;
+}
+
+.title {
+  margin-left: 245rpx;
+  padding-top: 30rpx;
+  font-size: 35rpx;
+  font-weight: 900;
+  margin-bottom: 30rpx;
+}
+
+.introuduce {
+  background-color: #fff7e7;
+  height: 70rpx;
+  width: 693rpx;
+  margin-top: 20rpx;
+  margin-left: 28rpx;
+  justify-content: space-around;
+  display: flex;
+  line-height: 70rpx;
+  font-size: 25rpx;
+  
+}
+.banjihz {
+  width: 57rpx;
+  height: 57rpx;
+  margin-right: 30rpx;
+  border-radius: 50%;
+}
+
+.zw {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  /* text-indent: 20rpx; */
+  font-size: 26rpx;
+  line-height: 40rpx;
+  height: 60vh;
+  /* border: 1px solid red; */
+  overflow-y: auto;
+}
+.dl{
+  text-indent: 56rpx;
+}
+.ewm{
+  width: 300rpx;
+  height: 300rpx;
+  margin-left: 160rpx;
+}
+.ermname{
+  margin-left: 50rpx;
+}
+.agree_text {
+  color: #000;
+  margin-left: 120rpx;
+  font-size: 24rpx;
+}
+
+.agree_btn {
+  text-align: center;
+  /* border: 1px solid red; */
+  width: 80%;
+  margin-left: 10%;
+  line-height: 80rpx;
+  font-size: 28rpx;
+  margin-top: 30rpx;
+  border-radius: 30rpx;
+  background-color: #eb3f33;
+  color: #fff;
+}
+
+.thinking {
+  color: #999999;
+  text-align: center;
+  font-size: 24rpx;
+  margin-top: 30rpx;
+}
 .step {
 .step {
   width: 690rpx;
   width: 690rpx;
   margin-left: 50rpx;
   margin-left: 50rpx;

+ 0 - 2
pages/myNotice/myNotice.js

@@ -1,6 +1,5 @@
 const app = require('../../utils/util.js');
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 const tools = require('../../utils/tools.js');
-// import WxValidate from '../../utils/WxValidate';
 Page({
 Page({
   data: {
   data: {
     active: 0,
     active: 0,
@@ -10,7 +9,6 @@ Page({
     showNull1: false
     showNull1: false
   },
   },
   getArr(sessionKey) {
   getArr(sessionKey) {
-    // let _this = this;
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/eduNoticeSee/list',
       url: app.globalData.publicUrl + '/wx/eduNoticeSee/list',
       method: "post",
       method: "post",

+ 28 - 1
pages/myPoints/myPoints.js

@@ -1,5 +1,32 @@
 Page({
 Page({
-  data: {},
+  data: {
+    dataArr: [{
+      img: "/images/gift1.jpg",
+      prizeName: "定制马克杯",
+      num: "限量100份",
+      fraction: "190积分"
+    }, {
+      img: "/images/gift2.jpg",
+      prizeName: "书籍(可选择)",
+      num: "限量50份",
+      fraction: "225积分"
+    }, {
+      img: "/images/gift3.jpg",
+      prizeName: "定制书签",
+      num: "限量100份",
+      fraction: "175积分"
+    }, {
+      img: "/images/gift4.jpg",
+      prizeName: "定制雨伞",
+      num: "限量20份",
+      fraction: "210积分"
+    }, {
+      img: "/images/gift5.jpg",
+      prizeName: "定制钥匙扣",
+      num: "限量200份",
+      fraction: "125积分"
+    }]
+  },
   dh() {
   dh() {
     wx.showModal({
     wx.showModal({
       showCancel: false,
       showCancel: false,

+ 5 - 42
pages/myPoints/myPoints.wxml

@@ -4,49 +4,12 @@
 		<view class="jfnum">0</view>
 		<view class="jfnum">0</view>
 		<view class="jftext">当前可用积分</view>
 		<view class="jftext">当前可用积分</view>
 	</view>
 	</view>
-	<view class="prize_box">
-		<image src="/images/gift1.jpg" mode='aspectFill' class="prize_img"></image>
+	<view class="prize_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src="{{item.img}}" mode='aspectFill' class="prize_img"></image>
 		<view class="prize_textbox">
 		<view class="prize_textbox">
-			<view class="text1">定制马克杯</view>
-			<view class="text2">限量100份</view>
-			<!-- <view class="text3">0人已领</view> -->
-			<view><text class="text4">190积分</text><text class="text5" bindtap="dh">立即兑换</text></view>
-		</view>
-	</view>
-	<view class="prize_box">
-		<image src="/images/gift2.jpg" mode='aspectFill' class="prize_img"></image>
-		<view class="prize_textbox">
-			<view class="text1">书籍(可选择)</view>
-			<view class="text2">限量50份</view>
-			<!-- <view class="text3">0人已领</view> -->
-			<view><text class="text4">225积分</text><text class="text5" bindtap="dh">立即兑换</text></view>
-		</view>
-	</view>
-	<view class="prize_box">
-		<image src="/images/gift3.jpg" mode='aspectFill' class="prize_img"></image>
-		<view class="prize_textbox">
-			<view class="text1">定制书签</view>
-			<view class="text2">限量100份</view>
-			<!-- <view class="text3">0人已领</view> -->
-			<view><text class="text4">175积分</text><text class="text5" bindtap="dh">立即兑换</text></view>
-		</view>
-	</view>
-		<view class="prize_box">
-		<image src="/images/gift4.jpg" mode='aspectFill' class="prize_img"></image>
-		<view class="prize_textbox">
-			<view class="text1">定制雨伞</view>
-			<view class="text2">限量20份</view>
-			<!-- <view class="text3">0人已领</view> -->
-			<view><text class="text4">210积分</text><text class="text5" bindtap="dh">立即兑换</text></view>
-		</view>
-	</view>
-		<view class="prize_box">
-		<image src="/images/gift5.jpg" mode='aspectFill' class="prize_img"></image>
-		<view class="prize_textbox">
-			<view class="text1">定制钥匙扣</view>
-			<view class="text2">限量200份</view>
-			<!-- <view class="text3">0人已领</view> -->
-			<view><text class="text4">125积分</text><text class="text5" bindtap="dh">立即兑换</text></view>
+			<view class="text1">{{item.name}}</view>
+			<view class="text2">{{item.num}}</view>
+			<view><text class="text4">{{item.fraction}}</text><text class="text5" bindtap="dh">立即兑换</text></view>
 		</view>
 		</view>
 	</view>
 	</view>
 </view>
 </view>

+ 0 - 7
pages/myPoints/myPoints.wxss

@@ -2,7 +2,6 @@
   width: 100%;
   width: 100%;
   height: 300rpx;
   height: 300rpx;
   position: relative;
   position: relative;
-  /* border: 1px solid red; */
 }
 }
 .cloud_img {
 .cloud_img {
   width: 100%;
   width: 100%;
@@ -11,7 +10,6 @@
 .jfnum{
 .jfnum{
   font-size: 65rpx;
   font-size: 65rpx;
   color: #fff;
   color: #fff;
-  /* font-weight: 900; */
   position: absolute;
   position: absolute;
   top: 25rpx;
   top: 25rpx;
   left: 350rpx;
   left: 350rpx;
@@ -19,7 +17,6 @@
 .jftext{
 .jftext{
   font-size: 35rpx;
   font-size: 35rpx;
   color: #fff;
   color: #fff;
-  /* font-weight: 900; */
   position: absolute;
   position: absolute;
   top: 115rpx;
   top: 115rpx;
   left: 280rpx;
   left: 280rpx;
@@ -29,18 +26,15 @@
   margin-left: 5%;
   margin-left: 5%;
   margin-top: 30rpx;
   margin-top: 30rpx;
   height: 260rpx;
   height: 260rpx;
-  /* border: 1px solid red; */
   display: flex;
   display: flex;
 }
 }
 .prize_img{
 .prize_img{
   width: 260rpx;
   width: 260rpx;
   height: 260rpx;
   height: 260rpx;
-  /* margin-top: 40rpx; */
 }
 }
 .prize_textbox{
 .prize_textbox{
   width: 430rpx;
   width: 430rpx;
   margin-left: 30rpx;
   margin-left: 30rpx;
-  /* border: 1px solid red; */
 }
 }
 .text1{
 .text1{
   font-size: 28rpx;
   font-size: 28rpx;
@@ -74,7 +68,6 @@
   font-weight: 700;
   font-weight: 700;
   margin-top: 30rpx;
   margin-top: 30rpx;
   float: right;
   float: right;
-  /* border: 1px solid red; */
   border-radius: 20rpx;
   border-radius: 20rpx;
   background-color: #ffebe8;
   background-color: #ffebe8;
   padding:5rpx 20rpx;
   padding:5rpx 20rpx;

+ 1 - 15
pages/myTraining/myTraining.js

@@ -34,25 +34,11 @@ Page({
         sessionKey: sessionKey
         sessionKey: sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
-        if (res.data.code == 0) {
+        if (res.data.code == 0 && res.data.data.length != 0) {
           this.setData({
           this.setData({
             dataArr: res.data.data
             dataArr: res.data.data
           })
           })
-          if (this.data.dataArr.length == 0) {
-            this.setData({
-              showNull: true
-            })
-          }
         } else {
         } else {
-          if (this.data.dataArr.length == 0) {
-            this.setData({
-              showNull: true
-            })
-          }
-        }
-      },
-      fail: () => {
-        if (this.data.dataArr.length == 0) {
           this.setData({
           this.setData({
             showNull: true
             showNull: true
           })
           })

+ 1 - 15
pages/onlineClass/onlineClass.js

@@ -27,25 +27,11 @@ Page({
         sessionKey: sessionKey
         sessionKey: sessionKey
       },
       },
       success: (res) => {
       success: (res) => {
-        if (res.data.code == 0) {
+        if (res.data.code == 0 && res.data.list.length != 0) {
           this.setData({
           this.setData({
             zbArr: res.data.list
             zbArr: res.data.list
           })
           })
-          if (res.data.list.length == 0) {
-            this.setData({
-              showNull: true
-            })
-          }
         } else {
         } else {
-          if (this.data.zbArr.length == 0) {
-            this.setData({
-              showNull: true
-            })
-          }
-        }
-      },
-      fail: () => {
-        if (this.data.zbArr.length == 0) {
           this.setData({
           this.setData({
             showNull: true
             showNull: true
           })
           })

+ 0 - 17
pages/onlineClass/onlineClass.wxml

@@ -1,21 +1,4 @@
 <view class="container">
 <view class="container">
-	<!-- <view class="video_box">
-		<view class="video" wx:for="{{zbArr}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
-			<view class="zbz">
-				<image src='../../images/online_icon.png' mode='aspectFill' class="onlineimg"></image>
-				<view class="onlinetext">{{item.isActive==1?"直播中":"待直播"}}</view>
-				<view class="onlinetext" wx:if='{{item.isActive==-1}}'> 开始时间:{{item.courseStart}}</view>
-			</view>
-			<image src='{{item.courseImg}}' mode='aspectFill' class="spbj"></image>
-			<view class="text1">{{item.courseName}}</view>
-			<view class="{{item.isActive==1?'getinroom':'nogetinroom'}}"  bindtap="goIn" data-item="{{item}}">进入课堂
-			</view>
-		</view>
-	</view>
-	<view wx:if="{{showNull}}">
-		<image src='/images/nodata.png' mode='aspectFill' class="nodata"></image>
-		<view class="nodata_text">暂无数据</view>
-	</view> -->
 	<view class="class_box" wx:for="{{zbArr}}" wx:for-index="idx" wx:for-item="item">
 	<view class="class_box" wx:for="{{zbArr}}" wx:for-index="idx" wx:for-item="item">
 		<view bindtap="goIn" data-item="{{item}}">
 		<view bindtap="goIn" data-item="{{item}}">
 			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>
 			<image src="{{item.courseImg}}" mode='aspectFill' class="scimg"></image>

+ 35 - 32
pages/personInfo/personInfo.js

@@ -1,39 +1,42 @@
 Page({
 Page({
   data: {
   data: {
-    logs: []
+    dataArr: [{
+        img: "/images/person1.png",
+        name: "我的培训",
+        subname: "社会总是善待努力学习的人",
+        url: '/pages/myTraining/myTraining'
+      },
+      {
+        img: "/images/person2.png",
+        name: "我的积分",
+        subname: "积少成多,检验收获",
+        url: '/pages/myPoints/myPoints'
+      }, {
+        img: "/images/person3.png",
+        name: "我的互动",
+        subname: "随时发布问题",
+        url: '/pages/InteractiveQA/InteractiveQA'
+      }, {
+        img: "/images/person4.png",
+        name: "后期跟踪",
+        subname: "",
+        url: '/pages/last/last'
+      }, {
+        img: "/images/person5.png",
+        name: "身份认证",
+        subname: "",
+        url: '/pages/Identity/Identity'
+      }, {
+        img: "/images/person6.png",
+        name: "使用指南",
+        subname: "",
+        url: '/pages/userGuide/userGuide'
+      }
+    ]
   },
   },
-  toIdentity() {
+  goTurn(e) {
     wx.navigateTo({
     wx.navigateTo({
-      url: '/pages/Identity/Identity',
-    })
-  },
-  goMytraining() {
-    wx.navigateTo({
-      url: '/pages/myTraining/myTraining',
-    })
-  },
-  goMypoints() {
-    wx.navigateTo({
-      url: '/pages/myPoints/myPoints',
-    })
-  },
-  goMyhz() {
-    wx.navigateTo({
-      url: '/pages/myInteractions/myInteractions',
-    })
-  },
-  hqgz() {
-    wx.navigateTo({
-      url: '/pages/last/last',
-    })
-  },
-  toUser(){
-    // wx.showModal({
-    //   showCancel: false,
-    //   content: '当前功能暂未开放'
-    // })
-    wx.navigateTo({
-      url: '/pages/userGuide/userGuide',
+      url: this.data.dataArr[e.currentTarget.dataset.index].url,
     })
     })
   }
   }
 })
 })

+ 14 - 54
pages/personInfo/personInfo.wxml

@@ -1,59 +1,19 @@
 <view class='container'>
 <view class='container'>
 	<view class="personxx">
 	<view class="personxx">
-	<view class="tx"><open-data type="userAvatarUrl"></open-data></view>
-	<view class="nc"><open-data type="userNickName" lang="zh_CN"></open-data>.你好</view>
+		<view class="tx">
+			<open-data type="userAvatarUrl"></open-data>
+		</view>
+		<view class="nc">
+			<open-data type="userNickName" lang="zh_CN"></open-data>.你好
+		</view>
 	</view>
 	</view>
-		<view class="top-content">
-			<view class="content"  bindtap="goMytraining">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person1.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title'>我的培训</view>
-					<view class="small-title">社会总是善待努力学习的人</view>
-				</view>
+	<view class="top-content">
+		<view class="content" bindtap="goTurn" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item" data-index="{{idx}}" wx:key="idx">
+			<van-image fit="cover" width="76rpx" height="76rpx" src="{{item.img}}" />
+			<view class='right-bpx'>
+				<view class='big-title'>{{item.name}}</view>
+				<view class="small-title">{{item.subname}}</view>
 			</view>
 			</view>
-			<view class="content" bindtap="goMypoints">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person2.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title'>我的积分</view>
-					<view class="small-title">积少成多,检验收获</view>
-				</view>
-			</view>
-			<view class="content" bindtap="goMyhz">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person3.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title'>我的互动</view>
-					<view class="small-title">随时发布问题</view>
-				</view>
-			</view>
-			<view class="content" bindtap="hqgz">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person4.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title'>后期跟踪</view>
-				</view>
-			</view>
-			<view class="content" bindtap="toIdentity">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person5.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title' >身份认证</view>
-				</view>
-			</view>
-						<view class="content" bindtap="toUser">
-				<view>
-					<van-image fit="cover" width="76rpx" height="76rpx" src="/images/person6.png" />
-				</view>
-				<view class='right-bpx'>
-					<view class='big-title' >使用指南</view>
-				</view>
-			</view>
-		</view> 
+		</view>
+	</view>
 </view>
 </view>

+ 1 - 1
pages/pyip/pyip.js

@@ -49,7 +49,7 @@ Page({
     }
     }
     wx.showLoading({
     wx.showLoading({
       mask: true,
       mask: true,
-      title: '加载中',
+      title: '上传中',
     })
     })
     // var CosAuth = require('./cos-auth'); //  COS 签名方法 https://unpkg.com/cos-js-sdk-v5/demo/common/cos-auth.min.js
     // var CosAuth = require('./cos-auth'); //  COS 签名方法 https://unpkg.com/cos-js-sdk-v5/demo/common/cos-auth.min.js
     var Bucket = 'bucketnj1-1254259530';
     var Bucket = 'bucketnj1-1254259530';

+ 1 - 66
pages/schoolIntrouce/schoolIntrouce.js

@@ -1,66 +1 @@
-// pages/schoolIntrouce/schoolIntrouce.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
+Page({})

+ 0 - 1
pages/schoolIntrouce/schoolIntrouce.wxml

@@ -39,5 +39,4 @@
 			场。</view>
 			场。</view>
 		<view class="dl" style="margin-bottom:60rpx">吉林长春社区干部学院欢迎您!</view>
 		<view class="dl" style="margin-bottom:60rpx">吉林长春社区干部学院欢迎您!</view>
 	</view>
 	</view>
-	<!-- <image src="../../images/logo.png" class="bj"></image> -->
 </view>
 </view>

+ 0 - 53
pages/studentList/studentList.js

@@ -1,10 +1,5 @@
-// pages/studentList/studentList.js
 const app = require('../../utils/util.js');
 const app = require('../../utils/util.js');
 Page({
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
   data: {
     Arr: []
     Arr: []
   },
   },
@@ -24,53 +19,5 @@ Page({
         }
         }
       }
       }
     })
     })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
   }
 })
 })

+ 1 - 1
pages/studentList/studentList.wxml

@@ -8,7 +8,7 @@
 	<van-row class="text2" wx:for="{{Arr}}" wx:for-item="item" wx:key="index">
 	<van-row class="text2" wx:for="{{Arr}}" wx:for-item="item" wx:key="index">
 		<van-col span="4">{{item.studentName}}</van-col>
 		<van-col span="4">{{item.studentName}}</van-col>
 		<van-col span="3">{{item.studentSex}}</van-col>
 		<van-col span="3">{{item.studentSex}}</van-col>
-		<van-col span="9">{{item.studentDuty}}</van-col>
+		<van-col span="9">{{item.studentDept}} / {{item.studentDuty}}</van-col>
 		<van-col span="8">{{item.studentPhone}}</van-col>
 		<van-col span="8">{{item.studentPhone}}</van-col>
 	</van-row>
 	</van-row>
 </view>
 </view>

+ 81 - 147
pages/studentRegistration/studentRegistration.wxml

@@ -1,161 +1,95 @@
 <view class="home">
 <view class="home">
 	<form bindsubmit="formSubmit">
 	<form bindsubmit="formSubmit">
-			<!-- <van-field name="username" value="{{ username }}" label="姓名" placeholder="请输入姓名" error-message="{{nameMessage}}" /> -->
-			<view class='fwb'>
-				<!-- <van-icon name="circle" /> -->
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">姓名</view>
-				<view class='weui-input'>
-					<input name="username" disabled value="{{ info.miniName }}" placeholder="请输入姓名" placeholder-style="font-size:25rpx" />
-					<!-- <view class="{{nameIsTrue?'error':'noerror'}}">请输入姓名</view> -->
-				</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
 			</view>
-			<!-- <van-field
-    value="{{ password }}"
-    label="密码"
-    placeholder="请输入密码"
-    required
-    border="{{ false }}"
-  /> -->
-			<!-- <van-radio-group value="{{ radio }}" bind:change="onChange">
-				<van-radio name="1">单选框 1</van-radio>
-				<van-radio name="2">单选框 2</van-radio>
-			</van-radio-group> -->
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">性别</view>
-				<!-- <view class='parameter-wrap'>
-					<block wx:for="{{parameter}}" wx:key="parameter">
-						<view class='parameter-info text-over {{item.checked?"checked_parameter":""}}' data-id='{{item.id}}' bindtap='parameterTap'>{{item.name}}</view>
-					</block>
-					<view class="{{errorIsTrue?'error':'noerror'}}">请选择性别</view>
-				</view> -->
-					<radio-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}' >
-						<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" checked="{{item.checked}}"  wx:for-index="idx" wx:for="{{parameter}}">
-							<radio value="{{ item.value }}" />{{item.name}}
-						</label>
-					</radio-group>
-			</view>
-			<!-- <van-field name="gongzuoName" value="{{ gongzuoName }}" label="工作单位" placeholder="请输入工作单位" error-message="{{nameMessage}}" />
-			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="文化程度" placeholder="请输入文化程度" error-message="{{nameMessage}}" />
-			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="毕业学校" placeholder="请输入最后毕业学校" error-message="{{nameMessage}}" />
-			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="所学专业" placeholder="请输入所学专业" error-message="{{nameMessage}}" />
-			<van-field name="gongzuoName" value="{{ gongzuoName }}" label="现任职务" placeholder="请输入现任职务" error-message="{{nameMessage}}" /> -->
-			<!-- <van-cell title="任职时间" value="{{ date }}" bind:click="onDisplay" /> -->
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">工作单位</view>
-				<view class='weui-input'>
-					<input class=""  name="studentDept" value="{{ studentDept }}" placeholder="请输入工作单位" placeholder-style="font-size:25rpx"/>
-					<!-- <view class="{{workIsTrue?'error':'noerror'}}">请输入工作单位</view> -->
-				</view>
+			<view class="xingbie">姓名</view>
+			<view class='weui-input'>
+				<input name="username" disabled value="{{ info.miniName }}" 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>
-				<!-- <view class='weui-input'>
-					<input class="" name="culture" value="{{culture }}" placeholder="请输入文化程度" placeholder-style="font-size:25rpx"/>
-				</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? '请选择':kaihutext}}</text>
-						</view>
-					</picker>
-			</view>
-			<view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">毕业学校</view>
-				<view class='weui-input'>
-					<input class="" name="school" value="{{ info.school }}" placeholder="请输入毕业学校" placeholder-style="font-size:25rpx"/>
-					<!-- <view class="{{graduationIsTrue?'error':'noerror'}}">请输入毕业学校</view> -->
-				</view>
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</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>
-				<view class='weui-input'>
-					<input class="" name="mcajor" value="{{ info.mcajor }}" placeholder="请输入所学专业" placeholder-style="font-size:25rpx"/>
-					<!-- <view class="{{majorIsTrue?'error':'noerror'}}">请输入所学专业</view> -->
-				</view>
+			<view class="xingbie">性别</view>
+			<radio-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}'>
+				<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" checked="{{item.checked}}" wx:for-index="idx" wx:for="{{parameter}}">
+					<radio value="{{ item.value }}" />{{item.name}}
+				</label>
+			</radio-group>
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
 			</view>
+			<view class="xingbie">工作单位</view>
+			<view class='weui-input'>
+				<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>
-				<view class='weui-input'>
-					<input class="" disabled name="studentDuty" value="{{ studentDuty }}" placeholder="请输入现任职务" placeholder-style="font-size:25rpx"/>
-					<!-- <view class="{{postIsTrue?'error':'noerror'}}">请输入现任职务</view> -->
-				</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</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>
-				<view class='weui-input' 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 class="{{renzhishijianIsTrue?'error':'noerror'}}">请输入任职时间</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? '请选择':kaihutext}}</text>
 				</view>
 				</view>
-				<van-popup show="{{ postshow }}" position="bottom" custom-style="height: 50%;">
-					<van-datetime-picker bind:confirm="onConfirm" bind:cancel='onClose' type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
-				</van-popup>
+			</picker>
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</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>
-				<view class='weui-input'>
-					<input class=""  name="studentPhone" value="{{ studentPhone }}" placeholder="请输入联系电话" placeholder-style="font-size:25rpx"/>
-					<!-- <view class="{{phoneIsTrue?'error':'noerror'}}">请输入联系电话</view> -->
-				</view>
+			<view class="xingbie">毕业学校</view>
+			<view class='weui-input'>
+				<input class="" name="school" value="{{ info.school }}" 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>
-				<view class='weui-input' style="font-size: 26rpx;  line-height: 56rpx;" catchtap="share">
-					{{peixunTime}}<view  wx:if='{{!peixunTime}}' style="color:#808080;display: inline-block;height:60rpx;line-height:60rpx;font-size:25rpx">{{peixunText}}</view>
-					<view class="{{peixunshijianTrue?'error':'noerror'}}">请选择培训时间</view>
-				</view>
-				<van-popup show="{{ postshow1 }}" position="bottom" custom-style="height: 50%;">
-					<van-datetime-picker bind:confirm="onConfirm1" bind:cancel='onClose1' type="date" value="{{ currentDate1 }}" bind:input="onInput1" min-date="{{ minDate }}" formatter="{{ formatter }}" />
-				</van-popup>
-			</view> -->
-			<!-- <view class='fwb'>
-				<view class="red-image">
-					<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
-				</view>
-				<view class="xingbie">培训时间</view>
-				<view class='time' catchtap="">
-					请选择培训时间
-				</view>
-			</view> -->
-
-
-
-
-		<!-- <button formType="submit">提交表单</button> -->
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">所学专业</view>
+			<view class='weui-input'>
+				<input class="" name="mcajor" value="{{ info.mcajor }}" 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>
+			<view class='weui-input'>
+				<input class="" disabled name="studentDuty" value="{{ studentDuty }}" 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>
+			<view class='weui-input' 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>
+			<van-popup show="{{ postshow }}" position="bottom" custom-style="height: 50%;">
+				<van-datetime-picker bind:confirm="onConfirm" bind:cancel='onClose' type="date" value="{{ currentDate }}" bind:input="onInput" min-date="{{ minDate }}" formatter="{{ formatter }}" />
+			</van-popup>
+		</view>
+		<view class='fwb'>
+			<view class="red-image">
+				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
+			</view>
+			<view class="xingbie">联系电话</view>
+			<view class='weui-input'>
+				<input class="" name="studentPhone" value="{{ studentPhone }}" placeholder="请输入联系电话" placeholder-style="font-size:25rpx" />
+			</view>
+		</view>
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 		<view style="margin-top: 100rpx;margin-bottom:100rpx">
 			<van-button round formType="submit">提交表单</van-button>
 			<van-button round formType="submit">提交表单</van-button>
 		</view>
 		</view>

+ 33 - 54
pages/testAnswer/testAnswer.js

@@ -50,7 +50,7 @@ Page({
       },
       },
       success: (res) => {
       success: (res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
-          if (res.data.list[0].answerScore) {
+          if (res.data.list[0].answerScore >= 0 && res.data.list[0].answerScore != null) {
             wx.navigateTo({
             wx.navigateTo({
               url: '/pages/grade/grade?answersId=' + answersId,
               url: '/pages/grade/grade?answersId=' + answersId,
             })
             })
@@ -58,74 +58,53 @@ Page({
             wx.showModal({
             wx.showModal({
               title: '提示',
               title: '提示',
               content: '当前老师批阅中,请耐心等待',
               content: '当前老师批阅中,请耐心等待',
-              showCancel: false,
-
+              showCancel: false
             })
             })
           }
           }
         }
         }
       }
       }
     })
     })
-
-  },
-  async onShow() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    this.setData({
-      sessionKey: sessionKey
-    })
-    this.getBanner(sessionKey);
   },
   },
-  getBanner(sessionKey) {
+  getBanner(sessionKey, allDone) {
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/list',
       url: app.globalData.publicUrl + '/wx/exam/list',
       method: "post",
       method: "post",
       data: {
       data: {
-        sessionKey: sessionKey,
+        sessionKey,
+        allDone
       },
       },
       success: (res) => {
       success: (res) => {
-        if (res.data.code == 0) {
-          if (res.data.list.length == 0) {
-            this.setData({
-              showNull: true
-            })
-          } else {
-            let newArr = res.data.list.findIndex(item => {
-              return item.questSub == '10'
-            })
-            if (newArr == 0 || newArr) {
-              wx.request({
-                url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
-                method: "post",
-                data: {
-                  sessionKey: sessionKey
-                },
-                success: (res1) => {
-                  if (res1.data.allDone) {
-                    this.setData({
-                      dataArr: res.data.list
-                    })
-                  } else {
-                    let arr = res.data.list.filter(item => {
-                      return item.questSub != '10'
-                    });
-                    this.setData({
-                      dataArr: arr
-                    })
-                  }
-                },
-              })
-            } else {
-              this.setData({
-                dataArr: res.data.list
-              })
-            }
-          }
+        if (res.data.code == 0 && res.data.list.length != 0) {
+          this.setData({
+            dataArr: res.data.list
+          })
+        } else {
+          this.setData({
+            showNull: true,
+          })
         }
         }
+      }
+    })
+  },
+  // 我的课程
+  getMycourse(sessionKey) {
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/course/selectBySessionKey',
+      method: "post",
+      data: {
+        sessionKey: sessionKey
       },
       },
-      fail: () => {
-        this.setData({
-          showNull: true
-        })
+      success: (res) => {
+        console.log(res.data.allDone)
+        this.getBanner(sessionKey, res.data.allDone)
       }
       }
     })
     })
   },
   },
+  async onShow() {
+    const sessionKey = await tools.checkSessionAndLogin();
+    this.setData({
+      sessionKey: sessionKey
+    })
+    this.getMycourse(sessionKey);
+  },
 })
 })

+ 2 - 2
pages/testAnswer/testAnswer.wxml

@@ -3,10 +3,10 @@
 		<image src="{{item.image}}" mode='aspectFill' class="scimg"></image>
 		<image src="{{item.image}}" mode='aspectFill' class="scimg"></image>
 		<view class="sctext">
 		<view class="sctext">
 			<view class="t1">{{item.examName}}</view>
 			<view class="t1">{{item.examName}}</view>
-			<view class="t2">主讲人: {{item.lecturer}}</view>
+			<view class="t2" wx:if="{{item.lecturer!=null}}">主讲人: {{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 == 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 == 1}}' class="t3" bindtap="lookAnswer" data-answersId='{{item.answersId}}'>查看成绩</view>
 		</view>
 		</view>
 		<view wx:if='{{item.status == 0}}' class="isanswertag">未答题</view>
 		<view wx:if='{{item.status == 0}}' class="isanswertag">未答题</view>
 		<view wx:if='{{item.status == 1}}' class="isanswertag" class="isanswertag isanswertag1">已答题</view>
 		<view wx:if='{{item.status == 1}}' class="isanswertag" class="isanswertag isanswertag1">已答题</view>

+ 0 - 59
pages/userGuide/userGuide.js

@@ -1,8 +1,4 @@
-// pages/userGuide/userGuide.js
 Page({
 Page({
-  /**
-   * 页面的初始数据
-   */
   data: {
   data: {
     Arr: [{
     Arr: [{
       num: "Q1",
       num: "Q1",
@@ -17,60 +13,5 @@ Page({
       question: "小程序随手拍功能上传照片时为何失败",
       question: "小程序随手拍功能上传照片时为何失败",
       answer: "目前图片仅支持JPG PNG格式,视频仅支持MP4格式。"
       answer: "目前图片仅支持JPG PNG格式,视频仅支持MP4格式。"
     }]
     }]
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
   }
   }
 })
 })

+ 1 - 1
pages/userGuide/userGuide.wxml

@@ -1,4 +1,4 @@
-<view wx:for="{{Arr}}" wx:for-item="item">
+<view wx:for="{{Arr}}" wx:for-item="item" wx:for-index="idx">
 	<view class="block">
 	<view class="block">
 		<view class="num">
 		<view class="num">
 			{{item.num}}
 			{{item.num}}

+ 1 - 1
pages/welcome/welcome.wxml

@@ -1,3 +1,3 @@
 <view>
 <view>
-	<image src='https://bucketnj1-1254259530.cos.ap-nanjing.myqcloud.com/20200704143337.gif' mode='aspectFill' style="width:750rpx;height:1334rpx" wx:if="{{kjShow}}"></image>
+	<image src='https://bucketnj1-1254259530.cos.ap-nanjing.myqcloud.com/20200704143337.gif' mode='aspectFill' style="width:750rpx;height:100vh" wx:if="{{kjShow}}"></image>
 </view>
 </view>

+ 0 - 1
pages/zbDetails/zbDetails.wxml

@@ -7,7 +7,6 @@
 					<view style="padding:30rpx">
 					<view style="padding:30rpx">
 						<view wx:for="{{chatContent}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" class="chat_text">
 						<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}}
 							<text>{{item.nick}}:</text>{{item.payload.text}}
-							<!-- {{item}} -->
 						</view>
 						</view>
 					</view>
 					</view>
 					<view id="scrollBottom" style="height:10rpx"></view>
 					<view id="scrollBottom" style="height:10rpx"></view>

+ 4 - 4
utils/util.js

@@ -1,9 +1,9 @@
 const globalData = {
 const globalData = {
   publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
   publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
-  // publicUrl: 'https://sqpx.jiaxintech.com',
-  // publicUrl:'http://10.16.10.139'
-  // publicUrl:'http://10.16.4.19:80'
-  // publicUrl:'http://10.16.4.26:80'
+  // 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
 };
 };
 module.exports = {
 module.exports = {
   globalData: globalData
   globalData: globalData