Merge branch 'master' of http://git.cc-lotus.info/ssfg/OnlineTraining0622

pages/Identity/Identity.js

@@ -11,12 +11,14 @@ Page({
     isInput2: false,
     isInput3: false
   },
+  // 错误信息回显
   showModal(error) {
     wx.showModal({
       content: error.msg,
       showCancel: false,
     })
   },
+  // 提交
   tj(sessionKey, params) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/student/uthentication',
@@ -43,15 +45,13 @@ Page({
         } else {
           wx.showModal({
             showCancel: false,
-            content: res.data.msg,
-            success(res) {
-              // if (res.confirm) {}
-            }
+            content: res.data.msg
           })
         }
       }
     })
   },
+  // 表单提交 跳转tj()
   async formSubmit(e) {
     wx.showLoading({
       mask: true,
@@ -76,6 +76,7 @@ Page({
       })
     }
   },
+  // 如果有就把信息回显出来
   getXx(sessionKey) {
     // let _this = this;
     wx.request({
@@ -109,8 +110,8 @@ Page({
     this.getXx(sessionKey);
     this.initValidate();
   },
+   // 验证字段的规则
   initValidate() {
-    // 验证字段的规则
     const rules = {
       userName: {
         required: true

pages/agoClass/agoClass.wxml

@@ -1,11 +1,10 @@
 <view class="container">
-<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
-<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
-<view class="sctext">
-<view class="t1">{{item.clasName}}</view>
-<view class="t2">主办：{{item.remark}}</view>
-<!-- <view class="t2">开始单位：{{item.clasBegin}}</view> -->
-	<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
-</view>
-</view>
+	<view class="class_box" wx:for="{{dataArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src="{{item.clasImg}}" mode='aspectFill' class="scimg"></image>
+		<view class="sctext">
+			<view class="t1">{{item.clasName}}</view>
+			<view class="t2">主办：{{item.remark}}</view>
+			<view class="t2">开班时间：{{item.beginDate}} 至 {{item.endDate}}</view>
+		</view>
+	</view>
 </view>

pages/dbDetails/dbDetails.js

@@ -1,30 +1,25 @@
-//index.js
-//获取应用实例
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
-// const app = getApp()
 Page({
   data: {
-    url: '',
-    title: '',
-    message: '',
-    playTimes: 0,
-    id: 0,
-    studyLog: {},
-    intervalTime: 0, //隔五分钟清空重新计时
-    currentTime: 0,
-    startPlayTime: 0,
+    url: '', //播放地址
+    title: '', //视频标题
+    message: '', //视频信息
+    playTimes: 0, //播放次数
+    startPlayTime: 0, // 从这个时间点开始播放
+    id: 0, //带过来的id
+    studyLog: {}, //学习日志
+    intervalTime: 0, //隔五分钟清空重新计时 弹出信息确认在不在
     video_real_time: 0, //实时播放进度
     initial_time: '', //视频跳转进度 秒
     intervalCtx: null,
     videoContext: null
   },
+  // 视频出错了
   videoErrorCallback: function (e) {
-    console.log('视频错误信息:')
-    console.log(e.detail.errMsg)
+    console.log('视频错误信息:', e.detail.errMsg)
   },
-  onReady: function () {},
-  // 计时
+  // 计时 五分钟弹出一个弹框
   calculateTime() {
     let _this = this;
     this.setData({
@@ -48,24 +43,24 @@ Page({
     }
     console.log(_this.data.intervalTime, "我是正在加的数")
   },
-  // 点击开始
+  // 点击开始播放视频
   bindplay() {
+    console.log("我点击开始了")
     this.setData({
       videoContext: wx.createVideoContext('myVideo')
     })
-    console.log("我点击开始了")
-    let _this = this;
-    _this.setData({
-      intervalCtx: setInterval(function () {
-        _this.calculateTime()
+    this.setData({
+      intervalCtx: setInterval(() => {
+        this.calculateTime()
       }, 5000)
     })
   },
-  // 暂停
+  // 视频暂停
   bindpause() {
     clearInterval(this.data.intervalCtx)
     console.log(this.data.intervalTime, "我是暂停时加的所有数")
   },
+  // 得到录播列表
   getdbArr(sessionKey) {
     let _this = this;
     wx.request({
@@ -83,11 +78,11 @@ Page({
           title: e.data.course.courseInfo,
           message: e.data.course.courseName,
           playTimes: e.data.course.playTimes
-
         })
       }
     })
   },
+  // 获取学习进度
   getStudyLog(sessionKey) {
     let _this = this;
     wx.request({
@@ -112,6 +107,7 @@ Page({
       }
     })
   },
+  // 设置不可快进
   timeUpdate: function (e) {
     //实时播放进度 秒数
     let _this = this;
@@ -142,6 +138,7 @@ Page({
       video_real_time: currentTime, //实时播放进度
     })
   },
+  // 修改学习进度
   chechEndStatus: function () {
     let _this = this;
     // let currentTime = parseInt(e.detail.currentTime)

pages/dbVideo/dbVideo.wxml

@@ -4,7 +4,6 @@
 	<view class="text_box">
 		<view class="title">{{title}}</view>
 		<view class="bfnum">{{playTimes}}次播放</view>
-		<!-- <view class="zj">主讲：授课教师</view> -->
 		<view class="zw">{{message}}
 		</view>
 	</view>

pages/historyClass/historyClass.js

@@ -2,7 +2,6 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
-    showzs: false,
     kcArr: [],
     showZhfk: true
   },
@@ -20,6 +19,7 @@ Page({
       })
     }
   },
+  // 获取列表
   getArr(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectByClasId',
@@ -33,30 +33,31 @@ Page({
         this.setData({
           kcArr: res.data.list
         });
-        // let result = [];
-        // if (res.data.list)
-        //   for (let i = 0; i < res.data.list.length; i++) {
-        //     result.push({
-        //       courseTime: res.data.list[i].courseTime
-        //     });
-        //   }
-        // const timesArr = result.map((item) => {
-        //   return item.courseTime;
-        // });
-        // let sfmArr = [];
-        // for (let i = 0; i < timesArr.length; i++) {
-        //   let value = timesArr[i];
-        //   const resultValue = this.handler(value);
-        //   sfmArr.push({
-        //     courseTime: resultValue
-        //   })
-        //   this.setData({
-        //     sfmArr: sfmArr
-        //   })
-        // }
+        let result = [];
+        if (res.data.list)
+          for (let i = 0; i < res.data.list.length; i++) {
+            result.push({
+              courseTime: res.data.list[i].courseTime
+            });
+          }
+        const timesArr = result.map((item) => {
+          return item.courseTime;
+        });
+        let sfmArr = [];
+        for (let i = 0; i < timesArr.length; i++) {
+          let value = timesArr[i];
+          const resultValue = this.handler(value);
+          sfmArr.push({
+            courseTime: resultValue
+          })
+          this.setData({
+            sfmArr: sfmArr
+          })
+        }
       }
     })
   },
+  // 处理时间
   handler(value) {
     //换算为秒 进制1000
     const second = Math.floor(value / 1000); //判断是否够1秒
@@ -76,10 +77,7 @@ Page({
     const hoursValue = hours % 60; //小时
     return `${hoursValue}时${minutesValue}分${secondValue}秒`;
   },
-  async onShow() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    this.getArr(sessionKey);
-  },
+  // 综合反馈填写
   goWrite2() {
     if (this.data.istask3 == false) {
       wx.showModal({
@@ -148,16 +146,14 @@ Page({
     })
   },
   async onLoad(options) {
-    console.log(options)
     const sessionKey = await tools.checkSessionAndLogin();
     this.setData({
-      sessionKey: sessionKey
-    })
-    this.setData({
+      sessionKey: sessionKey,
       id: options.id,
       name: options.name,
       clasEnd: options.clasEnd
     })
+    this.getArr(sessionKey);
     let currrentTime = new Date().getTime()
     let endTime = new Date(this.data.clasEnd).getTime()
     let day = Math.floor((currrentTime - endTime) / 86400000);

pages/historyClass/historyClass.wxml

@@ -1,41 +1,27 @@
 <view class="container">
-	<!-- <van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
-		<image src='{{classInfo.logoImg}}' mode='aspectFill' class="banjihz"></image><text>{{classInfo.clasName}}</text>
-	</van-divider> -->
-		<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
-			<image src='{{item.courseImg}}' mode="widthFix" class="spfm"></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="fisrt_set">
-					<image src='/images/db.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==-1}}'></image>
-					<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
-					<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
-					<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
-					<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
-					<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
-				</view>
-				<view class="name">{{item.courseName}}</view>
-				<view>
-					<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
-					<!-- <image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer"></image>
-					<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass"></image> -->
-				</view>
+	<van-divider contentPosition="center" customStyle="color: #eb3f33; border-color: #eb3f33; font-size: 30rpx;font-weight:900;position:relative">
+		<text>{{name}}</text>
+	</van-divider>
+	<view class="sp {{idx>2 ? 'none' : ''}}" wx:for="{{kcArr}}" wx:for-index="idx" wx:for-item="item">
+		<image src='{{item.courseImg}}' mode="widthFix" class="spfm"></image>
+		<view class="sp_text">
+			<view class="fisrt_set">
+				<image src='/images/db.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==-1}}'></image>
+				<image src='/images/zb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive == 1 && item.isActive==1}}'></image>
+				<image src='/images/dzb.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==null}}'></image>
+				<image src='/images/zbjs.png' mode='aspectFill' class="dbimg" wx:if='{{item.isLive==1 && item.isActive==-1}}'></image>
+				<view class="start_text" wx:if='{{item.isLive==1}}'>开始时间：{{item.courseStart}}</view>
+				<view class="start_text" wx:if='{{item.isLive==-1}}'>视频时长: {{sfmArr[idx].courseTime}}</view>
+			</view>
+			<view class="name">{{item.courseName}}</view>
+			<view>
+				<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
 			</view>
 		</view>
+	</view>
 	<view class="layout" style="margin-top:40rpx" bindtap="goWrite2" wx:if='{{showZhfk}}'>
 		<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 		<view class="layout_text1">综合反馈表</view>
 		<view class="layout_text3">去填写</view>
 	</view>
-	<!-- <view class="lq">
-		<view class="lq_btn" bindtap="lq">领取结业证</view>
-		<view class="pz">注：领取结业证需完成所有课程</view>
-	</view> -->
-	<!-- <van-popup show="{{ showzs }}" bind:close="onClose1">
-		<view style="position:relative">
-			<image src='/images/zsbj.jpg' mode='aspectFill' class="zsbj"></image>
-			<view class="byzc">李欣桐同志于2020年07月08日-2020年07月13日参加学习完成规定培训内容，准予结业，特发此证。</view>
-			<view class="byzc">{{studentName}}同志于{{classInfo.beginDate}}-{{classInfo.endDate}}参加学习完成规定培训内容，准予结业，特发此证。</view>
-		</view>
-	</van-popup> -->
 </view>

pages/myInteractions/myInteractions.js

@@ -1,10 +1,6 @@
 const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
     isshow1: false,
     isshow2: true,
@@ -13,10 +9,7 @@ Page({
     mytip: "",
     listArr: []
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
+  // tab1
   tab1Show() {
     this.setData({
       isshow1: false,
@@ -25,7 +18,9 @@ Page({
       unactivebg: "#f2f2f2"
     })
   },
-  askingList(sessionKey) {
+  //tab2
+  async tab2Show() {
+    const sessionKey = await tools.checkSessionAndLogin();
     wx.request({
       url: app.globalData.publicUrl + '/wx/board/list',
       method: "post",
@@ -58,10 +53,7 @@ Page({
       }
     })
   },
-  async tab2Show() {
-    const sessionKey = await tools.checkSessionAndLogin();
-    this.askingList(sessionKey)
-  },
+  // 去解答的详情页
   gojjDetails(e) {
     let id = e.currentTarget.dataset.item.id
     if (e.currentTarget.dataset.item.replyContent == "" || e.currentTarget.dataset.item.replyContent == null) {
@@ -104,10 +96,10 @@ Page({
           wx.showModal({
             showCancel: false,
             content: "提交成功",
-            success(res) {
+            success: (res) => {
               if (res.confirm) {
-                wx.switchTab({
-                  url: '../personInfo/personInfo'
+                this.setData({
+                  mytip: ""
                 })
               }
             }

pages/myMission/myMission.wxml

@@ -49,9 +49,8 @@
 		</view>
 	</view>
 	<view class="step" bindtap="goQmks">
-	<image src='{{istask4==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
-			<image src='/images/finallytest.png' mode='aspectFill' class="bgimg1 layout"></image>
-		<!-- </view> -->
+		<image src='{{istask4==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
+		<image src='/images/finallytest.png' mode='aspectFill' class="bgimg1 layout"></image>
 	</view>
 	<view class="step" bindtap="goWrite2">
 		<image src='{{istask5==false?"/images/step_unfinish.png":"/images/step_finish.png"}}' mode='aspectFill' class="finish_img"></image>
@@ -71,11 +70,4 @@
 		<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>
 	</view>
-	<!-- <van-popup show="{{ showzs }}" bind:close="onClose1">
-		<view style="position:relative">
-			<image src='/images/zsbj.jpg' mode='aspectFill' class="zsbj"></image>
-			<view class="byzc">李欣桐同志于2020年07月08日-2020年07月13日参加学习完成规定培训内容，准予结业，特发此证。</view> 
-			<view class="byzc">{{studentName}}同志于{{classInfo.beginDate}}-{{classInfo.endDate}}参加学习完成规定培训内容，准予结业，特发此证。</view> 
-		</view>
-	</van-popup> -->
 </view>

pages/myMission/myMission.wxss

@@ -46,13 +46,12 @@
   position: absolute;
   top: 90rpx;
   left: 200rpx;
-  padding-right:40rpx
+  padding-right: 40rpx
 }
 
 .sm_text {
   font-size: 28rpx;
   color: #999999;
-  /* margin-top: 20rpx; */
   font-weight: 900;
   position: absolute;
   top: 170rpx;
@@ -64,7 +63,6 @@
   height: 80rpx;
   font-size: 28rpx;
   color: #fff;
-  /* font-weight: 900; */
   position: absolute;
   bottom: 80rpx;
   left: 120rpx;
@@ -86,7 +84,6 @@
   height: 70rpx;
   width: 605rpx;
   background-color: #fff;
-  /* border: 1px solid red; */
   box-shadow: #f2f2f2 0px 0px 15rpx;
   float: right;
   margin-right: 30rpx;
@@ -122,9 +119,7 @@
 .layout {
   width: 610rpx;
   margin-left: 50rpx;
-  /* margin-left: 28rpx; */
   position: relative;
-  /* border: 1px solid red; */
   height: 74rpx;
 }
 
@@ -328,6 +323,7 @@
   height: 40rpx;
   border: 1px solid red;
 }
+
 .pz {
   font-size: 24rpx;
   color: #999999;

pages/myNotice/myNotice.wxml

@@ -1,13 +1,6 @@
 <van-tabs active="{{ active }}" bind:change="onChange">
 	<van-tab title="未读">
 		<view class="box">
-			<!-- <view class="box1 box2" wx:for="{{wdArr}}">
-				<image src="/images/wdtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
-				<view class="content content1">
-					<view>{{item.noticeContent}}</view>
-					<view class="btn" data-item="{{item}}" bindtap="btn">我知道了</view>
-				</view>
-			</view> -->
 			<view wx:for="{{wdArr}}">
 				<view class="box1">
 					<van-row>
@@ -35,10 +28,6 @@
 						</van-col>
 						<van-col span="22">{{item.noticeContent}}</van-col>
 					</van-row>
-					<!-- <image src="/images/ydtz.png" style="height: 32rpx; width: 32rpx;" mode="aspectFit"></image>
-				<view class="content">
-					<view>{{item.noticeContent}}</view>
-				</view> -->
 				</view>
 			</view>
 			<view wx:if="{{showNull1}}">

pages/myTraining/myTraining.js

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