1

pages/evaluationCourse/evaluationCourse.js

@@ -422,11 +422,16 @@ Page({
             success(res) {}
           })
         }else{
-          wx.switchTab({
-            url: '/pages/myClass/myClass',
+          wx.showModal({
+            showCancel: false,
+            content: '评价成功',
+            success() {
+              wx.navigateBack({
+                delta: 1
+              })
+            }
           })
         }
-      
       }
     })
     // let isTrue = false;

pages/evaluationCourse/evaluationCourse.wxss

@@ -51,6 +51,7 @@
   color: white;
   font-size: 30rpx;
   margin-top: 100rpx;
+  margin-bottom: 100rpx;
 }
 button:not([size='mini']) {
   width: 80%!important;

pages/myClass/myClass.js

@@ -3,29 +3,30 @@ const tools = require('../../utils/tools.js');
 Page({
   data: {
     showMore: false, //更多
-    showzs: false,
-    show: false,
+    showzs: false, //证书显示
+    show: false, //协议显示
     sessionKey: "",
     notice: "暂无未读通知",
-    classInfo: {},
-    kcArr: [],
-    sfmArr: [],
-    studentName: "",
+    classInfo: {}, //班级信息
+    kcArr: [], //课程列表
+    sfmArr: [], //换算时分秒数组
+    studentName: "", //学生明字
     status: '', //状态
-    myCanvasId: 0,
-    byzsbj: "../../images/zsbj.jpg",
+    myCanvasId: 0, //画布id
+    byzsbj: "../../images/zsbj.jpg", //结业证背景  用于合成图片
     IngCourseArr: [], //如果有正在进行的课就存一下
     istask1: false, //学员登记表是否完成
     istask2: false, //课程是否完成
     istask3: false, //期末考试是否完成
     istask4: false, //综合反馈是否完成
   },
-  // 更多
+  // 查看更多列表展开
   listToggle: function () {
     this.setData({
       showMore: !this.data.showMore
     })
   },
+  // 点击同意协议 并且记一下
   hidePopup() {
     this.setData({
       show: false
@@ -77,12 +78,7 @@ Page({
       }
     })
   },
-  myactiveMore() {
-    wx.navigateTo({
-      url: '../myActive/myActive'
-    })
-  },
-  // 随堂考试
+  // 去考试
   gokhAnswer(e) {
     if (this.data.istask1 == false) {
       wx.showModal({
@@ -92,7 +88,6 @@ Page({
       return false
     }
     let isStudyDone = e.currentTarget.dataset.item.isStudyDone
-    let isExam = e.currentTarget.dataset.item.isExam
     if (isStudyDone != 1) {
       wx.showModal({
         showCancel: false,
@@ -100,42 +95,37 @@ Page({
       })
       return false
     } else {
-      if (isExam == 0) {
-        wx.request({
-          url: app.globalData.publicUrl + '/wx/exam/examList',
-          method: "post",
-          data: {
-            sessionKey: this.data.sessionKey,
-            courseId: e.currentTarget.dataset.item.id,
-            clasId: this.data.classInfo.id
-          },
-          success: (res) => {
-            if (res.data.code == 0) {
-              console.log(res.data);
-              //let answersId =  res.data.list[0].answersId ;
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/examList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          courseId: e.currentTarget.dataset.item.id,
+          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) {
                   this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
                 } else {
-                  console.log('777777');
                   this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
                 }
               }
             }
           }
-        })
-      } else {
-        wx.showModal({
-          showCancel: false,
-          content: "您已经考完试了！"
-        })
-      }
+        }
+      })
     }
-    // console.log(e.currentTarget.dataset.courseid, "00");
   },
-  //我的班级去评价
+  //去评价
   gopjClass(e) {
-    console.log("000");
     if (this.data.istask1 == false) {
       wx.showModal({
         showCancel: false,
@@ -143,9 +133,7 @@ Page({
       })
       return false
     }
-    console.log(e.currentTarget.dataset.item, "8888")
     let isStudyDone = e.currentTarget.dataset.item.isStudyDone
-    let isFeedback = e.currentTarget.dataset.item.isFeedback
     if (isStudyDone != 1) {
       wx.showModal({
         showCancel: false,
@@ -153,56 +141,45 @@ Page({
       })
       return false
     } else {
-      if (isFeedback == 0) {
-        wx.request({
-          url: app.globalData.publicUrl + '/wx/exam/quesExamList',
-          method: "post",
-          data: {
-            sessionKey: this.data.sessionKey,
-            questSub: '3',
-            courseId: e.currentTarget.dataset.item.id,
-            clasId: this.data.classInfo.id
-          },
-          success: (res) => {
-            if (res.data.code == 0) {
-              console.log(res.data);
-              //let answersId =  res.data.list[0].answersId ;
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/quesExamList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          questSub: '3',
+          courseId: e.currentTarget.dataset.item.id,
+          clasId: this.data.classInfo.id
+        },
+        success: (res) => {
+          console.log(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) {
                   this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'evaluationCourse');
                 } else {
-                  console.log('777777');
                   this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'evaluationCourse');
                 }
               }
             }
+
           }
-        })
-      } else {
-        wx.showModal({
-          showCancel: false,
-          content: "您已经评价过了！"
-        })
-      }
+        }
+      })
     }
-
-
   },
+  // 我的积分
   goMyPoints() {
-    // wx.showModal({
-    //   showCancel: false,
-    //   content: "敬请期待",
-    //   success(res) {}
-    // })
     wx.navigateTo({
       url: '../myPoints/myPoints'
     })
   },
-  goactiveDetails() {
-    wx.navigateTo({
-      url: '../myactiveDetails/myactiveDetails'
-    })
-  },
+  // 领取结业证
   lq() {
     wx.showLoading({
       mask: true,
@@ -252,6 +229,7 @@ Page({
       }
     })
   },
+  // 存储结业证
   saveZs() {
     wx.canvasToTempFilePath({ //把当前画布指定区域的内容导出生成指定大小的图片
       canvasId: this.data.myCanvasId,
@@ -273,22 +251,21 @@ Page({
       }
     })
   },
+  // 证书隐藏
   onClose1() {
     this.setData({
       showzs: false
     });
   },
-  // 期末考试接口 、、、、、、
+  // 期末考试
   goQmks() {
-    // if (this.data.istask2 == false) {
-    //   wx.showModal({
-    //     showCancel: false,
-    //     content: "请按照任务顺序执行哦！"
-    //   })
-    //   return false
-    // }
-    console.log(this.data.sessionKey);
-    console.log(this.data.classInfo.id);
+    if (this.data.istask2 == false) {
+      wx.showModal({
+        showCancel: false,
+        content: "请按照任务顺序执行哦！"
+      })
+      return false
+    }
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/examList',
       method: "post",
@@ -298,53 +275,54 @@ Page({
       },
       success: (res) => {
         if (res.data.code == 0) {
-          console.log(res.data);
-          //let answersId =  res.data.list[0].answersId ;
-          console.log(res.data.list.length);
-          if (res.data.list[0]) {
-            if (res.data.list[0].answersId) {
-              if (res.data.list[0].status == '1') {
-                wx.request({
-                  url: app.globalData.publicUrl + '/wx/answer/detail',
-                  method: "post",
-                  data: {
-                    answersId: res.data.list[0].answersId
-                  },
-                  success: (res1) => {
-                    console.log(res,"纯涤的字  是是是是 ");
-                    
-                    if (res1.data.list[0].answerScore) {
-                      wx.navigateTo({
-                        url: '/pages/grade/grade?answersId=' + res.data.list[0].answersId,
-                      })
-                    } else {
-                      wx.showModal({
-                        showCancel: false,
-                        content: '当前老师批阅中,请耐心等待',
-                        success(res) {}
-                      })
+          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.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
+                this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
               }
-            } else {
-              this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
             }
           }
         }
       }
     })
   },
-  // 学员登记表 、、、、、、
+  // 学员登记表
   goWrite() {
     console.log(this.data.sessionKey);
     wx.navigateTo({
       url: '../studentRegistration/studentRegistration'
     })
   },
-  // 综合反馈表 、、、、、、
+  // 综合反馈表
   goWrite2() {
     if (this.data.istask3 == false) {
       wx.showModal({
@@ -353,10 +331,6 @@ Page({
       })
       return false
     }
-    console.log(this.data.sessionKey, "dayin");
-    console.log(this.data.classInfo.id);
-    //  已经完成的
-    console.log(this.data.istask4, "0000");
     if (this.data.istask4) {
       wx.request({
         url: app.globalData.publicUrl + '/wx/exam/quesExamList',
@@ -392,7 +366,6 @@ Page({
         success: (res) => {
           if (res.data.code == 0) {
             console.log(res.data, "zonghe");
-            //let answersId =  res.data.list[0].answersId ;
             console.log(res.data.list.length);
             if (res.data.list[0]) {
               if (res.data.list[0].answersId) {
@@ -434,26 +407,15 @@ Page({
       }
     })
   },
-  // goWrite2() {
-  //   // wx.showModal({
-  //   //   showCancel: false,
-  //   //   content: "敬请期待",
-  //   //   success(res) {}
-  //   // })
-  //   // wx.navigateTo({
-  //   //   url: '../feedBack/feedBack'
-  //   // })
-  //   this.getBanner1();
-  // },
   // 跳转直播点播页面
   goStudy(e) {
-    // if (this.data.istask1 == false) {
-    //   wx.showModal({
-    //     showCancel: false,
-    //     content: "请按照任务顺序执行哦！"
-    //   })
-    //   return false
-    // }
+    if (this.data.istask1 == false) {
+      wx.showModal({
+        showCancel: false,
+        content: "请按照任务顺序执行哦！"
+      })
+      return false
+    }
     let id = e.currentTarget.dataset.item.id //此课程的id
     console.log(id)
     console.log(this.data.IngCourseArr, "我是筛选的列表")
@@ -564,7 +526,7 @@ Page({
       }
     })
   },
-  // 我的通知
+  // 页面上显示的我的未读通知
   getMynotice(sessionKey) {
     // let _this = this;
     wx.request({
@@ -586,6 +548,7 @@ Page({
       }
     })
   },
+  // 跳转通知页
   gomyNotice() {
     // if (this.data.notice !== "暂无未读通知") {
     wx.navigateTo({
@@ -593,7 +556,7 @@ Page({
     })
     // }
   },
-  // // 我的课程
+  // 我的课程
   getMycourse(sessionKey) {
     // let _this = this;
     wx.request({
@@ -639,6 +602,7 @@ Page({
       }
     })
   },
+  // 时间换算
   handler(value) {
     //换算为秒 进制1000
     const second = Math.floor(value / 1000); //判断是否够1秒
@@ -676,6 +640,7 @@ Page({
       }
     })
   },
+  // 期末考试任务检查
   checkTaskList3(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/exam/clasExamstatus',
@@ -713,7 +678,7 @@ Page({
       }
     })
   },
-  // 查看成绩
+  // 查看详情成绩
   gockcj(e) {
     console.log(e.currentTarget.dataset.item.isExamId);
     if (e.currentTarget.dataset.item.isExamId) {
@@ -740,7 +705,7 @@ Page({
       })
     }
   },
-  // 查看评价
+  // 查看详情评价
   gockpj(e) {
     console.log(e.currentTarget.dataset.item.isFeedbackId);
     wx.navigateTo({
@@ -749,8 +714,6 @@ Page({
   },
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
-    console.log(sessionKey, "000000");
-    //const sessionKey = 'BqQROCKCxn7R2NXdQLud9Q==';
     this.setData({
       sessionKey: sessionKey
     })

pages/myMission/myMission.js

@@ -331,7 +331,7 @@ Page({
   },
   // 去学习
   goStudy(e) {
-    if (this.data.istask2 == false) {
+    if (this.data.istask1 == false) {
       wx.showModal({
         showCancel: false,
         content: "请按照任务顺序执行哦！"
@@ -339,6 +339,7 @@ Page({
       return false
     }
     let id = e.currentTarget.dataset.item.id //此课程的id
+    console.log(id)
     console.log(this.data.IngCourseArr, "我是筛选的列表")
     if (this.data.IngCourseArr.length == 0) {
       if (e.currentTarget.dataset.item.isLive == 1) {
@@ -380,14 +381,14 @@ Page({
       } else {
         wx.showModal({
           showCancel: false,
-          content: "您有未完成的学习课程，请先完成学习任务后再进行其他课程学习！"
+          content: "您的 ‘" + this.data.IngCourseArr.courseName + "’ 课还未学完,快去学习吧"
         })
       }
     }
   },
-  //去考试
+  // 去考试
   gokhAnswer(e) {
-    if (this.data.istask2 == false) {
+    if (this.data.istask1 == false) {
       wx.showModal({
         showCancel: false,
         content: "请按照任务顺序执行哦！"
@@ -395,7 +396,6 @@ Page({
       return false
     }
     let isStudyDone = e.currentTarget.dataset.item.isStudyDone
-    let isExam = e.currentTarget.dataset.item.isExam
     if (isStudyDone != 1) {
       wx.showModal({
         showCancel: false,
@@ -403,50 +403,45 @@ Page({
       })
       return false
     } else {
-      if (isExam == 0) {
-        wx.request({
-          url: app.globalData.publicUrl + '/wx/exam/examList',
-          method: "post",
-          data: {
-            sessionKey: this.data.sessionKey,
-            courseId: e.currentTarget.dataset.item.id,
-            clasId: this.data.classInfo.id
-          },
-          success: (res) => {
-            if (res.data.code == 0) {
-              console.log(res.data);
-              //let answersId =  res.data.list[0].answersId ;
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/examList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          courseId: e.currentTarget.dataset.item.id,
+          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) {
                   this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'answerAfterclass');
                 } else {
-                  console.log('777777');
                   this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'answerAfterclass');
                 }
               }
             }
           }
-        })
-      } else {
-        wx.showModal({
-          showCancel: false,
-          content: "您已经考完试了！"
-        })
-      }
+        }
+      })
     }
   },
-  // 去评价
+  //去评价
   gopjClass(e) {
-    if (this.data.istask2 == false) {
+    if (this.data.istask1 == false) {
       wx.showModal({
         showCancel: false,
         content: "请按照任务顺序执行哦！"
       })
       return false
     }
-    console.log(e.currentTarget.dataset.item, "8888")
     let isStudyDone = e.currentTarget.dataset.item.isStudyDone
-    let isFeedback = e.currentTarget.dataset.item.isFeedback
     if (isStudyDone != 1) {
       wx.showModal({
         showCancel: false,
@@ -454,48 +449,37 @@ Page({
       })
       return false
     } else {
-      if (isFeedback == 0) {
-        console.log(e.currentTarget.dataset, "111111111111111");
-        console.log(this.data.classInfo.id, "0000000000000");
-        wx.request({
-          url: app.globalData.publicUrl + '/wx/exam/quesExamList',
-          method: "post",
-          data: {
-            sessionKey: this.data.sessionKey,
-            questSub: '3',
-            courseId: e.currentTarget.dataset.item.id,
-            clasId: this.data.classInfo.id
-          },
-          success: (res) => {
-            if (res.data.code == 0) {
-              console.log(res.data);
-              //let answersId =  res.data.list[0].answersId ;
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/exam/quesExamList',
+        method: "post",
+        data: {
+          sessionKey: this.data.sessionKey,
+          questSub: '3',
+          courseId: e.currentTarget.dataset.item.id,
+          clasId: this.data.classInfo.id
+        },
+        success: (res) => {
+          console.log(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.navigateTo({
-                      url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + res.data.list[0].answersId,
-                    })
-                  } else {
-                    this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'evaluationCourse');
-                  }
+                  this.toPath(res.data.list[0].id, res.data.list[0].paperId, res.data.list[0].answersId, 'evaluationCourse');
                 } else {
-                  console.log('777777');
                   this.beginKao(res.data.list[0].id, res.data.list[0].paperId, this.data.sessionKey, 'evaluationCourse');
                 }
               }
             }
+
           }
-        })
-      } else {
-        wx.showModal({
-          showCancel: false,
-          content: "您已经评价过了！"
-        })
-      }
+        }
+      })
     }
-
-
   },
   // 期末考试
   goQmks() {
@@ -713,9 +697,45 @@ Page({
       showzs: false
     });
   },
+  // 查看详情成绩
+  gockcj(e) {
+    console.log(e.currentTarget.dataset.item.isExamId);
+    if (e.currentTarget.dataset.item.isExamId) {
+      wx.request({
+        url: app.globalData.publicUrl + '/wx/answer/detail',
+        method: "post",
+        data: {
+          answersId: e.currentTarget.dataset.item.isExamId
+        },
+        success: (res) => {
+          console.log(res.data, "我是第四个任务的检查状态")
+          if (res.data.list[0].answerScore) {
+            wx.navigateTo({
+              url: '/pages/grade/grade?answersId=' + e.currentTarget.dataset.item.isExamId,
+            })
+          } else {
+            wx.showModal({
+              showCancel: false,
+              content: '当前老师批阅中,请耐心等待',
+              success(res) {}
+            })
+          }
+        }
+      })
+    }
+  },
+  // 查看详情评价
+  gockpj(e) {
+    console.log(e.currentTarget.dataset.item.isFeedbackId);
+    wx.navigateTo({
+      url: '/pages/evaluationCourseDetail/evaluationCourseDetail?answersId=' + e.currentTarget.dataset.item.isFeedbackId,
+    })
+  },
   async onShow() {
     const sessionKey = await tools.checkSessionAndLogin();
-    this.setData({sessionKey})
+    this.setData({
+      sessionKey
+    })
     this.isClass(sessionKey);
     this.getMycourse(sessionKey);
     this.checkTaskList(sessionKey)

pages/myMission/myMission.wxml

@@ -23,7 +23,8 @@
 		<view class="layout">
 			<image src='/images/xydj_bj.png' mode='aspectFill' class="bgimg1"></image>
 			<view class="layout_text1">学员登记表</view>
-			<view class="layout_text2">去填写</view>
+			<view class="layout_text2" wx:if='{{istask2}}'>查看详情</view>
+			<view class="layout_text2" wx:else>去填写</view>
 		</view>
 	</view>
 	<view class="step">
@@ -42,8 +43,10 @@
 					</view>
 					<view class="name">{{item.courseName}}</view>
 					<image src='/images/startstudy.png' mode='aspectFill' class="an" data-item="{{item}}" bindtap="goStudy"></image>
-					<image src='/images/dtxs.png' mode='aspectFill' class="an" bindtap="gokhAnswer" data-item="{{item}}"></image>
-					<image src='/images/pjkc.png' mode='aspectFill' class="an" bindtap="gopjClass" data-item="{{item}}"></image>
+					<image src='/images/dtxs.png' wx:if='{{item.isExam==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gokhAnswer"></image>
+					<image src='/images/pjkc.png' wx:if='{{item.isFeedback==0}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gopjClass"></image>
+					<image src='/images/ckcj.png' wx:if='{{item.isExam==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockcj"></image>
+					<image src='/images/ckpj.png' wx:if='{{item.isFeedback==1}}' mode='aspectFill' class="an" data-item="{{item}}" bindtap="gockpj"></image>
 				</view>
 			</view>
 		</view>
@@ -57,7 +60,8 @@
 		<view class="layout">
 			<image src='/images/zhfk_bj.png' mode='aspectFill' class="bgimg1"></image>
 			<view class="layout_text1">综合反馈表</view>
-			<view class="layout_text3">去填写</view>
+			<view class="layout_text2" wx:if='{{istask5}}'>查看详情</view>
+			<view class="layout_text2" wx:else>去填写</view>
 		</view>
 	</view>
 	<view class="step">

pages/studentRegistration/studentRegistration.js

@@ -164,7 +164,6 @@ Page({
         errorIsTrue: true
       })
     }
-
     if (!e.detail.value.work) {
       this.setData({
         workIsTrue: true
@@ -262,9 +261,16 @@ Page({
         sessionKey: this.data.sessionKey,
         mcajor: aa.mcajor,
       },
-      success: (res) => {
-        console.log(res);
-
+      success: () => {
+        wx.showModal({
+          showCancel: false,
+          content: '提交成功',
+          success() {
+            wx.navigateBack({
+              delta: 1
+            })
+          }
+        })
       }
     })
 

pages/zbDetails/zbDetails.js

@@ -2,44 +2,48 @@ const app = require('../../utils/util.js');
 const tools = require('../../utils/tools.js');
 Page({
   data: {
-    url: '',
-    title: '',
-    message: '',
-    playTimes: 0,
-    id: 0,
-    socketOpen: false,
-    chatContent: [],
-    inputValue: '',
-    bottom: "",
-    pushUrl: '',
-    videoContext: '',
-    fullScreenFlag: false,
-    livectx: "",
+    url: '', //直播地址
+    title: '', //直播课名字
+    message: '', //直播课信息
+    playTimes: 0, //多少人在看（播放次数）
+    id: 0, //带过来的id
+    socketOpen: false, //socket打开状态
+    chatContent: [], //聊天内容
+    inputValue: '', //我输入的话
+    bottom: "", //滑到底状态 防止弹出消息不跳到最后一条
+    pushUrl: '', //我的推流地址
+    videoContext: '', //绑定pusher
+    fullScreenFlag: false, //全屏状态
+    livectx: "", //绑定player
     spfx: "vertical",
     spfx1: "vertical",
-    isHands: false,
-    timeoutObj: null,
-    _timeout: 5000,
-    isCloseStatus: false
+    isHands: false, //是否举手状态
+    timeoutObj: null, //心跳定时
+    _timeout: 5000, //5秒发送一次心跳
+    isCloseStatus: false //关闭状态
   },
+  // socket状态改变
   statechange: function (e) {
     console.log(e)
   },
+  // 滑动聊天室
   scrollToTop() {
     this.setAction({
       scrollTop: 0
     })
   },
-  onReady: function () {},
+  // 绑定输入的话
   bindKeyInput: function (e) {
     this.setData({
       inputValue: e.detail.value
     })
   },
+  // 点击举手
   hands() {
     console.log("我点击举手了")
     this.sendSocketMessage("put up hands")
   },
+  // 提交我说的话
   submit: function () {
     let input_val = this.data.inputValue;
     this.sendSocketMessage(input_val)
@@ -47,7 +51,8 @@ Page({
       inputValue: ''
     })
   },
-  fullScreen: function() {
+  // 全屏执行
+  fullScreen: function () {
     let fullScreenFlag = this.data.fullScreenFlag;
     if (fullScreenFlag) {
       fullScreenFlag = false;
@@ -94,6 +99,7 @@ Page({
       });
     }
   },
+  // 获取直播信息
   getZbArr(sessionKey) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/course/selectLiveByCourseId',
@@ -114,6 +120,7 @@ Page({
       }
     })
   },
+  // socket连接
   socketConnect(sessionKey) {
     let newSessionkey = encodeURIComponent(sessionKey);
     wx.connectSocket({
@@ -125,7 +132,7 @@ Page({
         socketOpen: true
       })
       this.setData({
-        timeoutObj: setInterval( ()=> {
+        timeoutObj: setInterval(() => {
           this.startHeart(sessionKey)
         }, this.data._timeout)
       })
@@ -246,5 +253,4 @@ Page({
     const sessionKey = await tools.checkSessionAndLogin();
     this.getZbArr(sessionKey);
   }
-
 })