11

app.json

@@ -10,7 +10,7 @@
     "pages/myClass/myClass",
     "pages/Identity/Identity",
     "pages/grade/grade",
-    "pages/livePlayback/livePlayback", 
+    "pages/livePlayback/livePlayback",
     "pages/demandCourses/demandCourses",
     "pages/myInteractions/myInteractions",
     "pages/testAnswer/testAnswer",
@@ -38,7 +38,8 @@
     "pages/myInteractionsDetais/myInteractionsDetais",
     "pages/myPoints/myPoints",
     "pages/myTraining/myTraining",
-    "pages/agoClass/agoClass"
+    "pages/agoClass/agoClass",
+    "pages/videoPlayBack/videoPlayBack"
   ],
   "window": {
     "backgroundTextStyle": "light",

components/trtc-room/trtc-room.js

@@ -1232,11 +1232,9 @@ Component({
       const userSig = rtcConfig.userSig
       const roomID = rtcConfig.roomID
       const privateMapKey = rtcConfig.privateMapKey
-
       rtcConfig.useCloud = rtcConfig.useCloud === undefined ? true : rtcConfig.useCloud
       let url = rtcConfig.useCloud ? 'https://official.opensso.tencent-cloud.com/v4/openim/jsonvideoapp' : 'https://yun.tim.qq.com/v4/openim/jsonvideoapp'
       url += '?sdkappid=' + sdkAppID + '&identifier=' + userID + '&usersig=' + userSig + '&random=' + Date.now() + '&contenttype=json'
-
       const reqHead = {
         'Cmd': 1,
         'SeqNo': 1,

pages/answerAfterclass/answerAfterclass.wxss

@@ -23,7 +23,7 @@
   text-align: justify;
   font-size: 28rpx;
   height: 210rpx;
-  border: 1px solid #fff;
+  /* border: 1px solid #fff; */
   overflow-y: auto;
 }
 

pages/answerAfterclasses/answerAfterclasses.wxss

@@ -30,7 +30,7 @@
   text-align: justify;
   font-size: 28rpx;
   height: 210rpx;
-  border: 1px solid #fff;
+  /* border: 1px solid #fff; */
   overflow-y: auto;
 }
 .qiu {

pages/evaluationCourse/evaluationCourse.wxss

@@ -127,11 +127,19 @@ textarea {
 }
 
 .my-choosebox1 {
-  color: rgba(51, 51, 51, 1);
+  /* color: rgba(51, 51, 51, 1);
   width: 100rpx;
   line-height: 100rpx;
   border: 2rpx solid rgba(211, 211, 211, 1);
   padding: 5rpx 10rpx;
   margin: 20rpx;
+  border-radius: 10rpx; */
+  color: rgba(51, 51, 51, 1);
+  width: 300rpx;
+  padding: 10rpx 20rpx;
+  background: #FFF0ED;
+  margin: 20rpx;
   border-radius: 10rpx;
+  display: block;
+  text-align: center;
 }

pages/feedBack/feedBack.wxml

@@ -33,10 +33,12 @@
 			</view>
 		</view>
 		<view class='fwb' wx:if="{{ item.QuestType == 1}}">
-			<view class="red-image">
+		<view style="display:flex">			
+		   <view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
 			<view class="xingbie">{{item.QuestStem}}</view>
+			</view>
 			<view class='weui-input' style=" background: white">
 				<checkbox-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}' bindchange="checkboxChange">
 					<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{item.QuestChoice}}">

pages/groupsList/groupsList.js

@@ -1,3 +1,5 @@
+const app = require('../../utils/util.js');
+const tools = require('../../utils/tools.js');
 Page({
   data: {
     Arr: [{
@@ -21,5 +23,19 @@ Page({
       zw: "项目秘书",
       phone: "18604413379"
     }]
+  },
+  async onLoad() {
+    const sessionKey = await tools.checkSessionAndLogin();
+    wx.request({
+      url: app.globalData.publicUrl + '/wx/student/getTeamPosition',
+      method: "post",
+      data: {
+        sessionKey
+      },
+      success: (res) => {
+        console.log(res.data.clasResult);
+        console.log(res.data.studentClasResult);
+      }
+    })
   }
 })

pages/historyClass/historyClass.js

@@ -8,7 +8,8 @@ Page({
   },
   // 跳转直播点播页面
   goStudy(e) {
-    let id = e.currentTarget.dataset.item
+    console.log(e.currentTarget.dataset.item)
+    let id = e.currentTarget.dataset.item.id
     let courseName = e.currentTarget.dataset.item.courseName
     let courseUrl = e.currentTarget.dataset.item.courseUrl
     let courseInfo = e.currentTarget.dataset.item.courseInfo
@@ -38,7 +39,7 @@ Page({
       }
     } else {
       wx.navigateTo({
-        url: '../dbDetails/dbDetails?id=' + id
+        url: '../videoPlayBack/videoPlayBack?id=' + id + '&courseUrl=' + courseUrl + '&courseInfo=' + courseInfo + '&courseName=' + courseName
       })
     }
   },

pages/index/index.js

@@ -170,7 +170,7 @@ Page({
       url: app.globalData.publicUrl + '/wx/course/listCategory',
       method: "post",
       success: (res) => {
-        if (this.data.xczsArr.length != 0) {
+        if (this.data.xczsArr && this.data.xczsArr.length != 0) {
           if (this.data.xczsArr.sort().toString() != res.data.list.sort().toString()) {
             this.setData({
               xczsArr: res.data.list

pages/lastdetail/lastdetail.js

@@ -292,7 +292,6 @@ Page({
       if (new RegExp("(" + k + ")").test(fmt))
         fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
     return fmt;
-
   },
   async onLoad(options) {
     wx.showLoading({
@@ -320,6 +319,7 @@ Page({
     }
   },
   allShi(id, paperId, sessionKey) {
+    wx.hideLoading();
     wx.request({
       url: app.globalData.publicUrl + '/wx/paper/detail',
       method: "post",
@@ -336,6 +336,8 @@ Page({
           json.QuestAnswer = item.QuestAnswer;
           json.QuestStem = item.QuestStem;
           if (item.QuestType == '1' || item.QuestType == '0') {
+            // console.log(item.QuestChoice,"aaaaa");
+            // console.log(item.QuestType,"ccccc");
             let arr = item.QuestChoice.split('||');
             let arrJson = arr.map(item => {
               let json1 = {};
@@ -360,7 +362,6 @@ Page({
           questionList: jsonArr,
           chooseValue: chooceArr
         })
-        wx.hideLoading();
         wx.setStorageSync('questionList' + wx.getStorageSync('answersId'), this.data.questionList);
         wx.setStorageSync('chooseValue' + wx.getStorageSync('answersId'), this.data.chooseValue);
       },

pages/lastdetail/lastdetail.wxml

@@ -33,10 +33,11 @@
 			</view>
 		</view>
 		<view class='fwb' wx:if="{{ item.QuestType == 1}}">
-			<view class="red-image">
+		<view style="display:flex">			<view class="red-image">
 				<image src="/images/quan.png" style="width:20rpx;height:20rpx"> </image>
 			</view>
-			<view class="xingbie">{{item.QuestStem}}</view>
+			<view class="xingbie">{{item.QuestStem}}</view></view>
+
 			<view class='weui-input' style=" background: white">
 				<checkbox-group name="{{item.name}}" data-index='{{index}}' data-idx='{{item.Id}}' data-questTypes='{{item.QuestType}}' bindchange="checkboxChange">
 					<label class="checkbox my-choosebox {{ item.checked?'checkboxbox':''}}" wx:for-index="idx" wx:for="{{item.QuestChoice}}">

pages/lastdetail/lastdetail.wxss

@@ -61,9 +61,6 @@ button:not([size='mini']) {
   margin-top: 40rpx;
   flex-direction: column;
 }
-
-
-
 .error {
   font-size: 24rpx;
   color: #EE0A24;
@@ -164,11 +161,19 @@ textarea {
 }
 
 .my-choosebox {
-  color: rgba(51, 51, 51, 1);
+  /* color: rgba(51, 51, 51, 1);
   width: 200rpx;
   padding: 10rpx 80rpx;
   background: #FFF0ED;
   margin: 10rpx;
   line-height: 80rpx;
+  border-radius: 10rpx; */
+  color: rgba(51, 51, 51, 1);
+  width: 300rpx;
+  padding: 10rpx 20rpx;
+  background: #FFF0ED;
+  margin: 20rpx;
   border-radius: 10rpx;
+  display: block;
+  text-align: center;
 }

pages/personInfo/personInfo.js

@@ -103,18 +103,16 @@ Page({
       },
       success: (res) => {
         console.log(res);
-        if (res.data.code == 0) {
-          console.log(res)
-          if (res.data.data.studentOpenId != null) {
+          console.log(res.data.msg)
+          if (res.data.msg == '您尚未认证,请先进行身份认证!') {
             this.setData({
-              isRz: false
+              isRz: true
             })
           }else{
             this.setData({
-              isRz: true
+              isRz: false
             })
           }
-        }
       }
     })
   },

pages/testAnswer/testAnswer.wxml

@@ -4,7 +4,7 @@
 		<view class="sctext">
 			<view class="t1">{{item.examName}}</view>
 			<view class="t2" wx:if="{{item.lecturer!=null}}">主讲人: {{item.lecturer}}</view>
-			<view class="t2">{{item.examBegin}}至{{item.examEnd}}</view>
+			<view class="t2" wx:if="{{item.examBegin!=null&&item.examEnd!=null}}">{{item.examBegin}}至{{item.examEnd}}</view>
 			<view wx:if='{{item.status == 0}}' class="t3" bindtap="startAnswer" data-answersId='{{item.answersId}}' data-idx='{{item.id}}' data-paperId='{{item.paperId}}'>开始答题</view>
 			<view wx:if='{{item.status == 1}}' class="t3" bindtap="lookAnswer" data-answersId='{{item.answersId}}'>查看成绩</view>
 		</view>

pages/videoPlayBack/videoPlayBack.js

@@ -0,0 +1,93 @@
+// pages/livePlayback/livePlayback.js
+const app = require('../../utils/util.js');
+const tools = require('../../utils/tools.js');
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: "",
+    title: "",
+    message: ""
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  async onLoad (options) {
+    console.log(options)
+    const sessionKey = await tools.checkSessionAndLogin();
+    // let _this = this;
+    wx.request({
+      method: "post",
+      url: app.globalData.publicUrl + '/wx/course/selectRecordByCourseId',
+      data: {
+        sessionKey: sessionKey,
+        courseId:options.id
+      },
+      success: (e) => {
+        console.log(e, "888888888888888888")
+        this.setData({
+          url: e.data.url,
+          // show: false,
+          title: e.data.course.courseName,
+          message: e.data.course.courseInfo,
+          playTimes: e.data.course.playTimes
+        })
+      }
+    })
+  // this.setData({
+  //   url: options.courseUrl,
+  //   title:options.courseName,
+  //   message:options.courseInfo
+  // })
+},
+
+/**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+onReady: function () {
+
+},
+
+/**
+ * 生命周期函数--监听页面显示
+ */
+onShow: function () {
+
+},
+
+/**
+ * 生命周期函数--监听页面隐藏
+ */
+onHide: function () {
+
+},
+
+/**
+ * 生命周期函数--监听页面卸载
+ */
+onUnload: function () {
+
+},
+
+/**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+onPullDownRefresh: function () {
+
+},
+
+/**
+ * 页面上拉触底事件的处理函数
+ */
+onReachBottom: function () {
+
+},
+
+/**
+ * 用户点击右上角分享
+ */
+onShareAppMessage: function () {
+
+}
+})

pages/videoPlayBack/videoPlayBack.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "录播回放"
+}

pages/videoPlayBack/videoPlayBack.wxml

@@ -0,0 +1,9 @@
+<view class="home">
+	<video src="{{url}}" show-play-btn="ture" show-mute-btn="true" controls id="myVideo">
+	</video>
+	<view class="text_box">
+		<view class="title"  wx:if="{{title}}">{{title}}</view>
+		<view class="zw" wx:if="{{message!='null'}}">{{message}}
+		</view>
+	</view>
+</view>

pages/videoPlayBack/videoPlayBack.wxss

@@ -0,0 +1,27 @@
+#myVideo{
+  width: 100%;
+}
+.text_box{
+width: 90%;
+margin-left: 5%;
+}
+.title{
+  font-size: 32rpx;
+  margin-top: 50rpx;
+}
+.bfnum{
+color: #999999;
+font-size: 25rpx;
+margin-top: 10rpx;
+height: 50rpx;
+border-bottom: 1px solid #dbdbdb;
+}
+.zj{
+  font-size: 32rpx;
+  margin-top: 20rpx;
+}
+.zw{
+  font-size: 25rpx;
+  margin-top: 40rpx;
+  line-height: 40rpx;
+}

pages/zbDetails/zbDetails.wxml

@@ -1,6 +1,6 @@
 <view class="home">
 	<view class="big_box">
-		<trtc-room id="trtcroom" config="{{rtcConfig}}" scene="live"></trtc-room>
+		<trtc-room id="trtcroom" config="{{rtcConfig}}" scene="live" ></trtc-room>
 		<view class="area">
 			<view class="chatbox">
 				<scroll-view scroll-y="true" style="height: 490rpx;width:690rpx;" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" scroll-into-view="{{bottom}}" scroll-top="{{scrollTop}}">

utils/util.js

@@ -1,11 +1,10 @@
 const globalData = {
-  publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
-  // publicUrl: 'https://sqpx.jiaxintech.com'//正式地址
+  // publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
+  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
 };
-
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1