修改加入课堂

董佳音
Commit 30f6fc742f1c61ef75f21fbd1f2316069780e05f 30f6fc74 1 parent 4ad53160
dist/stylesheets/style.css
etc/umd.template.html
src/ape/AboutClassApe.js
src/ape/AdministratorApe.js
src/ape/CreateClassApe.js
src/ape/CreateGradeApe.js
src/ape/CreateUserApe.js
src/ape/LoginOrRegister.js
src/ape/ManagementHomePageApe.js
src/ape/MyBookingsApe.js
src/ape/MyCenterApe.js
src/ape/MyCoursesApe.js
src/ape/PartTimeTeachingApe.js
src/ape/PlayRecordApe.js
src/ape/SubscribeApe.js
src/main.js
src/proxy/ClassDataProxy.js
--- a/dist/stylesheets/style.css
查看文件 @30f6fc7
+++ b/dist/stylesheets/style.css
查看文件 @30f6fc7
@@ -829,6 +829,7 @@ body{
   float: left;
   font-size: 12px;
   text-align: center;
+  cursor: pointer;
 }
 .t_box{
   border:1px solid #e6e6e6;
--- a/etc/umd.template.html
查看文件 @30f6fc7
+++ b/etc/umd.template.html
查看文件 @30f6fc7
@@ -572,7 +572,7 @@
                         <ul class="liveInfoLeft userClassList" id="userClassList3">
                             <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">老师</li>
                             <li class="liveInfoLeftLi" data="8">学生</li>
-                            <li class="liveInfoLeftLi" data="2">兼课</li>
+                            <li class="liveInfoLeftLi" data="32">兼课</li>
                         </ul>
                         <div class="liveInfoRight" id="liveInfoRight3">
                             <input class="liveInfoRightInput" id="liveInfoRightInput3" type="text">
@@ -763,9 +763,9 @@
                         </div>
                         <div class="liveInfoCenter" id="liveInfoCenter5">
                             <span class="liveInfoCenterTime">时间</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveStart5"></div>
+                            <div class="liveInfoCenterLiveCase liveInfoCenterLiveStart" id="liveInfoCenterLiveStart5"></div>
                             <span class="liveInfoCenterTime">至</span>
-                            <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div>
+                            <div class="liveInfoCenterLiveCase liveInfoCenterLiveEnd" id="liveInfoCenterLiveEnd5"></div>
                         </div>
                     </div>
                     <div class="classManagementRightContent classManagementRightContent0" id="courseContent5">
@@ -1554,9 +1554,7 @@
                     </div>
                     <div class="myCenterTopRightBox">
                         <label class="myCenterTopRightTit">今日课程</label>
-                        <ul id="myCurriculumInfo">
-                            <div class="myCenterTopRightContent">暂无课程！</div>
-                        </ul>
+                        <ul id="myCurriculumInfo"></ul>
                     </div>
                     <div class="teacherMyCerter" id="teacherMyCerter">
                         <div class="myCenterContentTitleBox">
@@ -2051,7 +2049,7 @@
                 <div class="">
                     <select class="createUserRole" name="createUserRole" id="createUserRole">
                         <option value="1">老师</option>
-                        <option value="2">监课</option>
+                        <option value="32">监课</option>
                     </select>
                 </div>
                 <div class="removeHandlerBtn">
@@ -2097,11 +2095,11 @@
                             角色：
                         </label>
                         <div class="step_page1_widget">
-                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="3" checked="checked">
+                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="1" checked>
                             <label for="createUserTeacher" class="publicInfo">
                                 老师
                             </label>
-                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="2">
+                            <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="32">
                             <label for="createUserTeaching" class="publicInfo">
                                 兼课
                             </label>
--- a/src/ape/AboutClassApe.js
查看文件 @30f6fc7
+++ b/src/ape/AboutClassApe.js
查看文件 @30f6fc7
@@ -6,7 +6,6 @@ import Loger from "../Loger";
 import Ape from "./Ape";
 import $ from "jquery";
 import ClassDataProxy from "proxy/ClassDataProxy";
-import dateUI from 'libs/laydate';
 let loger = Loger.getLoger('PC-AboutClassApe');
 const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" id="t_box" class="t_box">
--- a/src/ape/AdministratorApe.js
查看文件 @30f6fc7
+++ b/src/ape/AdministratorApe.js
查看文件 @30f6fc7
@@ -45,26 +45,34 @@ class AdministratorApe extends Ape {
         }
     }
     _dateUI(){
-        //执行一个laydate实例
+        //执行一个laydate实例   课程管理开始时间
         dateUI.render({
-            elem: '.liveInfoCenterLiveStart' //指定元素
+            elem: '#liveInfoCenterLiveStart0' //指定元素
         });
-        //执行一个laydate实例
+        //执行一个laydate实例   课程管理结束时间
         dateUI.render({
-            elem: '.liveInfoCenterLiveEnd' //指定元素
+            elem: '#liveInfoCenterLiveEnd0' //指定元素
         });
-        //执行一个laydate实例
+        //执行一个laydate实例  创建课堂开始时间
         dateUI.render({
             elem: '#createClassStartTime' //指定元素
         });
-        //执行一个laydate实例
+        //执行一个laydate实例  创建课堂结束时间
         dateUI.render({
             elem: '#createClassEndTime' //指定元素
         });
-        //执行一个laydate实例
+        //执行一个laydate实例  创建用户显示时间
         dateUI.render({
             elem: '#createUserAbortTime' //指定元素
         });
+        //执行一个laydate实例   录制回放开始时间
+        dateUI.render({
+            elem: '#liveInfoCenterLiveStart5' //指定元素
+        });
+        //执行一个laydate实例   录制回放结束时间
+        dateUI.render({
+            elem: '#liveInfoCenterLiveEnd5' //指定元素
+        });
     }
     //设置当前时间 给输入框默认值
     _setNewTime(){
--- a/src/ape/CreateClassApe.js
查看文件 @30f6fc7
+++ b/src/ape/CreateClassApe.js
查看文件 @30f6fc7
@@ -253,15 +253,12 @@ class CreateClassApe extends Ape {
     detailClass(){
         let dateList = this.classDateList;
         let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting';
-        //let userName = window.localStorage.getItem('loginName');
-        let userType = window.localStorage.getItem('userType');
+        let userType = ClassDataProxy.userType;
         dateList.siteId = ClassDataProxy.siteId;
         dateList.userId = '123';
-      //  dateList.userName = userName;
         dateList.userType = userType;
         let that = this;
-        console.log('创建课堂前数据',dateList)
         $.ajax({
             type : "POST",
             url : _url,
--- a/src/ape/CreateGradeApe.js
查看文件 @30f6fc7
+++ b/src/ape/CreateGradeApe.js
查看文件 @30f6fc7
@@ -40,8 +40,8 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="8%" class="tr_main">{_totalNmu}</td>
                                 <td width="8%" class="tr_main">{_latest}</td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">删除</a>
-                                    <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">查看约课信息</a>
+                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">删除</a>
+                                    <a id="{_joinInd}" class="classHandlePort" href="javascript:void(0);" data="{_aboutMsg}">查看约课信息</a>
                                 </td>
                             </tr>
 `;
--- a/src/ape/CreateUserApe.js
查看文件 @30f6fc7
+++ b/src/ape/CreateUserApe.js
查看文件 @30f6fc7
@@ -40,8 +40,8 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="8%" class="tr_main">{_totalNmu}</td>
                                 <td width="8%" class="tr_main">{_latest}</td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">删除</a>
-                                    <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">查看约课信息</a>
+                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">删除</a>
+                                    <a id="{_joinInd}" class="classHandlePort" href="javascript:void(0);" data="{_aboutMsg}">查看约课信息</a>
                                 </td>
                             </tr>
 `;
@@ -84,7 +84,6 @@ class CreateUserApe extends Ape {
         $('#classHandlerSpecificPage3_2').on('click',this._assignPageHandler.bind(this));//指定页
         $('#courseContent3').on('click','.deleteClass',this._deleteClass.bind(this));//删除课堂
-
     }
     addEvent() {
@@ -250,7 +249,7 @@ class CreateUserApe extends Ape {
                 //学生  列表
                 this._manageStudent(1);
                 break;
-            case 2:
+            case 32:
                 //兼课  列表
                 this._manageSupervise(1);
                 break;
@@ -282,7 +281,7 @@ class CreateUserApe extends Ape {
     }
     //兼课  列表
     _manageSupervise(ind){
-        let data = {siteId:ClassDataProxy.siteId,userType:2};
+        let data = {siteId:ClassDataProxy.siteId,userType:32};
         let that = this;
         this.publicAjax(data,7,ind,function(_data){
             if(_data){
@@ -335,7 +334,6 @@ class CreateUserApe extends Ape {
             let pagenum = Math.ceil(count / pageno);
             let _dataList = _data.meetingInfo;
             this.pageNo = pagenum;
-            console.log('sssssssss',count)
             $('#classHandlerPageMsg3_0').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
             if(count <=7){
                 $('#classHandlerPageBox3_0').hide();
@@ -366,7 +364,6 @@ class CreateUserApe extends Ape {
             let pagenum = Math.ceil(count / pageno);
             let _dataList = _data.meetingInfo;
             this.pageNo = pagenum;
-            console.log('sssssssss',count)
             $('#classHandlerPageMsg3_2').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
             if(count <=7){
                 $('#classHandlerPageBox3_2').hide();
@@ -461,19 +458,22 @@ class CreateUserApe extends Ape {
         ClassDataProxy.getMarginTopHandler($('#createUser'));//显示预约成功弹框
         $('#createUserBox').show();
         let val = $('#createUserRole').val();
+        let ind = 0;
         let name = '';
         switch (parseInt(val)){
-            case 0:
+            case 1:
                 name = '老师';
+                ind = 0;
                 break;
-            case 1:
+            case 32:
                 name = '兼课';
+                ind = 1;
                 break;
             default:
                 return;
         }
         $('#createUserTitle').html('添加'+name)
-        $("input[name='createUserTeacher']").get(val).checked = true;//创建身份
+        $("input[name='createUserTeacher']").get(ind).checked = true;//创建身份
     }
     //创建用户
     _createUserConfirmHandler(){
--- a/src/ape/LoginOrRegister.js
查看文件 @30f6fc7
+++ b/src/ape/LoginOrRegister.js
查看文件 @30f6fc7
@@ -258,7 +258,7 @@ class LoginOrRegister extends Ape {
                 "password": _passWord.value,  //登录密码
                 "companyName":null,  //公司名字
                 "userName":_name.value, //用户名
-                "userRole":4, // 用户角色 0超级管理员，1管理员，2监课，3老师，4学生
+                "userRole":8, // 用户角色 0超级管理员，1管理员，2监课，3老师，4学生
                 "userType": 8,
                 "userEmail":mail.value, // 用户邮箱
                 "userMobile":parseInt(phone.value), // 用户手机号
@@ -361,6 +361,7 @@ class LoginOrRegister extends Ape {
                         ClassDataProxy.monicker = _data.returnData.data.userName;
                         ClassDataProxy.userEmail = _data.returnData.data.userEmail;
                         ClassDataProxy.userMobile = _data.returnData.data.userMobile;
+                        ClassDataProxy.userRole = _data.returnData.data.userRole;
                         window.localStorage.setItem("loginName",ClassDataProxy.loginName);//登录名
                         window.localStorage.setItem("password", ClassDataProxy.password );//密码
@@ -374,6 +375,7 @@ class LoginOrRegister extends Ape {
                         window.localStorage.setItem('monicker',  ClassDataProxy.monicker);
                         window.localStorage.setItem('userEmail',  ClassDataProxy.userEmail);
                         window.localStorage.setItem('userMobile',  ClassDataProxy.userMobile);
+                        window.localStorage.setItem('userRole',  ClassDataProxy.userRole);
                         that.successLogin();
                         //登录成功后 个人信息输入信息框中
--- a/src/ape/ManagementHomePageApe.js
查看文件 @30f6fc7
+++ b/src/ape/ManagementHomePageApe.js
查看文件 @30f6fc7
@@ -414,7 +414,55 @@ class ManagementHomePageApe extends Ape {
     }
     _joinClass(evt){
         let _data = $(evt.target).attr('data');
-        window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + _data);
+        let countList = this.countList[_data];
+        if(!countList){
+            return;
+        }
+        let dateList = {
+            "siteId": countList[0].siteId,
+            "mtgKey": countList[0].classroomNumber,
+            "mtgTitle": "无",
+            "userName":countList[0].create_user,
+            "meetingName":countList[0].meetingName || '123',
+            "userType":ClassDataProxy.userType,
+            "language": 2,
+            "userId": new Date().getTime(),
+            "meetingType": countList[0].meetingType,
+            "timestamp": 123321,
+            "presenterPassword": countList[0].presenterPassword || '1111',
+            "startTime": countList[0].beginTime,
+            "endTime": countList[0].endTime,
+            "isPublic": countList[0].isPublic,
+            "hostPwd": countList[0].hostPassword,
+            "h5Module": countList[0].h5Module,
+            "maxVideoChannels": countList[0].maxVideoChannels,
+            "maxAudioChannels": countList[0].maxAudioChannels,
+            "videoQuality": countList[0].videoQuality
+        }
+
+        let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting';
+        let that = this;
+        $.ajax({
+            type : "POST",
+            url : _url,
+            data : dateList,
+            timeout:5000,
+            headers: {'token':ClassDataProxy.token,"siteId":ClassDataProxy.siteId},
+            success:function(_data){
+                //获取课堂数据
+                if(_data && _data.code == 0){
+                    loger.log('加入课堂成功',_data)
+                    that._enterClass(_data.returnData.data);
+                }
+            },
+            error:function(error){
+                console.log(error,'加入课堂失败')
+            }
+        })
+
+    }
+    _enterClass(_data){
+        window.open(_data.meetingUrl);
     }
     _updatacover(evt){
         ClassDataProxy.getMarginTopHandler($('#updataPhoto'));
--- a/src/ape/MyBookingsApe.js
查看文件 @30f6fc7
+++ b/src/ape/MyBookingsApe.js
查看文件 @30f6fc7
@@ -82,6 +82,7 @@ class MyBookingsApe extends Ape {
         $('#teacherCorrelatedInfo').on('click','.teacherCorrelatedInfoBtn',this._teacherSubscribeMoveHandler.bind(this));//点击预约查看当前点击的更多信息
         $('#teacherCorrelatedInfo').on('click','.cancelReservation',this._cancelReservationBtn.bind(this));//取消预约
+        $('#removeHandlerA').on('click',this._removeCancelHandler.bind(this));//取消预约 取消
         $('#removeCancel').on('click',this._removeCancelHandler.bind(this));//取消预约 取消
         $('#removeConfirm').on('click',this._removeConfirmHandler.bind(this));//取消预约 确定
@@ -178,7 +179,7 @@ class MyBookingsApe extends Ape {
                         _classifyListR : j?'classifyListR':'',
                         _isShowTitle : 'none',
                         _id:_data[i].meetingId,
-                        _meetingNumber : _data[i].meetingNumber,
+                        _meetingNumber : _data[i].meetingId,
                         _msgImg : '../images/u373.png',
                         _meetingName : _data[i].meeting_name,
                         _create_user : _data[i].teacherName,
@@ -351,9 +352,107 @@ class MyBookingsApe extends Ape {
             this.showcancelBox();
         }else{
             let ind = $(evt.target).attr('data');
-            window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + ind);
+            this._classId(ind);
+          //  this._joinClass(ind);
+          //  window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + ind);
         }
     }
+    _classId(ind){
+        if(ind){
+            let that = this;
+            let data = {
+                id: ind,
+                siteId:ClassDataProxy.siteId
+            }
+            this.detailPage(data,function(_data){
+                if(_data && _data.code == 200){
+                    let _dataInfo = _data.returnData.data.meetingInfo;
+                    if(_dataInfo){
+                        that._joinClass(_dataInfo);
+                    }
+                }
+            })
+        }
+    }
+    detailPage(data,callback){
+        let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
+        $.ajax({
+            type: "POST",
+            url: _url,
+            timeout:5000,
+            data : data,
+            headers: {siteId:ClassDataProxy.siteId,
+                'token':ClassDataProxy.token},
+            success:function(_data){
+                //获取我的课程数据
+                if(_data && _data.code == 200){
+                    if(callback){
+                        callback(_data);
+                    }
+                }else{
+                    if(callback){
+                        callback(null);
+                    }
+                }
+            },
+            error:function(error){
+                if(callback){
+                    callback(null);
+                }
+                loger.log(error,'直播数据获取失败')
+            }
+        })
+    }
+    _joinClass(_data){
+        if(!_data){
+            return;
+        }
+        let dateList = {
+            "siteId": _data[0].siteId,
+            "mtgKey": _data[0].classroomNumber,
+            "mtgTitle": "无",
+            "userName":_data[0].create_user,
+            "meetingName":_data[0].meetingName || '123',
+            "userType":ClassDataProxy.userType,
+            "language": 2,
+            "userId": new Date().getTime(),
+            "meetingType": _data[0].meetingType,
+            "timestamp": 123321,
+            "presenterPassword": _data[0].presenterPassword || '1111',
+            "startTime": _data[0].beginTime,
+            "endTime": _data[0].endTime,
+            "isPublic": _data[0].isPublic,
+            "hostPwd": _data[0].hostPassword,
+            "h5Module": _data[0].h5Module,
+            "maxVideoChannels": _data[0].maxVideoChannels,
+            "maxAudioChannels": _data[0].maxAudioChannels,
+            "videoQuality": _data[0].videoQuality
+        }
+
+        let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting';
+        let that = this;
+        $.ajax({
+            type : "POST",
+            url : _url,
+            data : dateList,
+            timeout:5000,
+            headers: {'token':ClassDataProxy.token,"siteId":ClassDataProxy.siteId},
+            success:function(_data){
+                //获取课堂数据
+                if(_data && _data.code == 0){
+                    loger.log('加入课堂成功',_data)
+                    that._enterClass(_data.returnData.data);
+                }
+            },
+            error:function(error){
+                console.log(error,'加入课堂失败')
+            }
+        })
+
+    }
+    _enterClass(_data){
+        window.open(_data.meetingUrl);
+    }
     showcancelBox(_id){
         ClassDataProxy.getMarginTopHandler($('#removeHandler'));
         $("#removeHandlerBox").show();
--- a/src/ape/MyCenterApe.js
查看文件 @30f6fc7
+++ b/src/ape/MyCenterApe.js
查看文件 @30f6fc7
@@ -67,9 +67,9 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="15%" class="tr_main">{_timer}</td>
                                 <td width="7%" class="tr_main">{_num}</td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">文档</a>
-                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">多媒体</a>
-                                    <a class="classHandlePort resolveBtn" href="###" data="{_aboutMsg}">伴音</a>
+                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">文档</a>
+                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">多媒体</a>
+                                    <a class="classHandlePort resolveBtn" href="javascript:void(0);" data="{_aboutMsg}">伴音</a>
                                 </td>
                             </tr>
 `;
@@ -122,7 +122,6 @@ class MyCenterApe extends Ape {
     defaultDateList(){
          let studentInfoList = $('#studentInfoList');
          this._anewLoad(studentInfoList)//默认显示第一个列表
-         this._studentStudyModule();
     }
     //首页
     _homePageHandler(){
@@ -485,7 +484,7 @@ class MyCenterApe extends Ape {
                         }
                         let curInfo = that._format(curriculumList, {
                             _infoTit: item.meetingName,
-                            _meetingNumber: item.meetingNumber,
+                            _meetingNumber: item.meetingId,
                             _countDown: timer,
                             _isShow: (lastTimer == 1) ? 'none' : 'block'
                         })
@@ -502,7 +501,7 @@ class MyCenterApe extends Ape {
         let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName,meetingStatus:1};
         let that = this;
         this._teacherCurriculumInfo(data,4,ind,function(_data){
-            //首页直播信息渲染
+            //首页直播信息渲染  正在直播
             if(_data){
                 that._teacherLivePage(_data.returnData.data);
                 that._teacherLiveCourse(_data.returnData.data);
@@ -513,7 +512,7 @@ class MyCenterApe extends Ape {
         let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName,meetingStatus:2};
         let that = this;
         this._teacherCurriculumInfo(data,4,ind,function(_data){
-            //首页直播信息渲染
+            //首页直播信息渲染  未开始
             if(_data){
                 that._teacherNotPage(_data.returnData.data);
                 that._teacherLiveCourse(_data.returnData.data);
@@ -524,7 +523,7 @@ class MyCenterApe extends Ape {
         let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName,meetingStatus:4};
         let that = this;
         this._teacherCurriculumInfo(data,4,ind,function(_data){
-            //首页直播信息渲染
+            //首页直播信息渲染  结束
             if(_data){
                 that._teacherOverPage(_data.returnData.data);
                 that._teacherLiveCourse(_data.returnData.data);
@@ -634,7 +633,7 @@ class MyCenterApe extends Ape {
                         }
                         let curInfo = that._format(curriculumList, {
                             _infoTit: item.meeting_name,
-                            _meetingNumber: item.meetingNumber,
+                            _meetingNumber: item.meetingId,
                             _countDown: timer,
                             _isShow: (lastTimer == 1) ? 'none' : 'block'
                         })
@@ -673,7 +672,7 @@ class MyCenterApe extends Ape {
                             _isShowTitle : 'none',
                             _id:_data[i].meetingId,
                             _studyMsg:'进入学习',
-                            _meetingNumber : _data[i].meetingNumber,
+                            _meetingNumber : _data[i].meetingId,
                             _msgImg : _img?_img:defaultImg,
                             _meetingName : _data[i].meeting_name,
                             _create_user : _data[i].teacherName,
@@ -719,7 +718,7 @@ class MyCenterApe extends Ape {
                             _isShowTitle : 'none',
                             _id:_data[i].meetingId,
                             _studyMsg:'继续学习',
-                            _meetingNumber : _data[i].meetingNumber,
+                            _meetingNumber : _data[i].meetingId,
                             _msgImg : _img?_img:defaultImg,
                             _meetingName : _data[i].meeting_name,
                             _create_user : _data[i].teacherName,
--- a/src/ape/MyCoursesApe.js
查看文件 @30f6fc7
+++ b/src/ape/MyCoursesApe.js
查看文件 @30f6fc7
@@ -26,11 +26,6 @@ const classifyList = `<div class="courseMinuteListTimeTit" style="display: {_isS
                             <p class="myCenterContentMin">45min</p>
                             <span class="myCenterContentTimer">{_liveTimer}</span>
                         </div>`;
-const curriculumList = `<li class="teacherTodayCourseList">
-                                <span class="courseDetailInfo">{_infoTit}</span>
-                                <span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">{_countDown}</i></span>
-                                <button class="teacherEnterClass btnHover" data="{_meetingNumber}" style="display: {_isShow}">立即进入</button>
-                            </li>`;
 const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" class="t_box">
                         <tbody>
@@ -67,9 +62,9 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="15%" class="tr_main">{_timer}</td>
                                 <td width="7%" class="tr_main">{_num}</td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">文档</a>
-                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">多媒体</a>
-                                    <a class="classHandlePort resolveBtn" href="###" data="{_aboutMsg}">伴音</a>
+                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">文档</a>
+                                    <a class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">多媒体</a>
+                                    <a class="classHandlePort resolveBtn" href="javascript:void(0);" data="{_aboutMsg}">伴音</a>
                                 </td>
                             </tr>
 `;
@@ -449,7 +444,7 @@ class MyCoursesApe extends Ape {
                         let _classifyList = this._format(classifyList,{
                             _classifyListR : j ?'classifyListR':'',
                             _isShowTitle : n == 0 ?'block':'none',
-                            _meetingNumber : arrList[n].meetingNumber,
+                            _meetingNumber : arrList[n].meetingId,
                             _id:arrList[n].meetingId,
                             _studyMsg:'进入学习',
                             _msgImg : _img?_img: defaultImg,
@@ -520,7 +515,7 @@ class MyCoursesApe extends Ape {
                                 _isShowTitle : n == 0 ?'block':'none',
                                 _studyMsg:'继续学习',
                                 _id:arrList[n].meetingId,
-                                _meetingNumber : arrList[n].meetingNumber,
+                                _meetingNumber : arrList[n].meetingId,
                                 _msgImg : _img?_img: defaultImg,
                                 _meetingName : arrList[n].meeting_name,
                                 _create_user : arrList[n].teacherName,
--- a/src/ape/PartTimeTeachingApe.js
查看文件 @30f6fc7
+++ b/src/ape/PartTimeTeachingApe.js
查看文件 @30f6fc7
@@ -45,8 +45,8 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 </td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">更改成员</a>
-                                    <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">删除</a>
+                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">更改成员</a>
+                                    <a id="{_joinInd}" class="classHandlePort" href="javascript:void(0);" data="{_aboutMsg}">删除</a>
                                 </td>
                             </tr>
 `;
--- a/src/ape/PlayRecordApe.js
查看文件 @30f6fc7
+++ b/src/ape/PlayRecordApe.js
查看文件 @30f6fc7
@@ -40,9 +40,9 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
                                 <td width="8%" class="tr_main">{_totalNmu}</td>
                                 <td width="8%" class="tr_main">{_latest}</td>
                                 <td  width="10%" class="tr_main tr_mainRight" align="center">
-                                    <a id="{_removeInd}" class="classHandlePort playRecord" data="{_userName}" href="#">播放</a>
-                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="###">删除</a>
-                                    <a id="{_joinInd}" class="classHandlePort" href="###" data="{_aboutMsg}">设置为非公开</a>
+                                    <a id="{_removeInd}" class="classHandlePort playRecord" data="{_userName}" href="javascript:void(0);">播放</a>
+                                    <a id="{_removeInd}" class="classHandlePort deleteClass" data="{_aboutMsg}" href="javascript:void(0);">删除</a>
+                                    <a id="{_joinInd}" class="classHandlePort" href="javascript:void(0);" data="{_aboutMsg}">设置为非公开</a>
                                 </td>
                             </tr>
 `;
@@ -86,14 +86,14 @@ class PlayRecordApe extends Ape {
         window.open("http://networkshool.xuedianyun.com/3m/doPlayRecord.do?meetingNumber=" + ind);
     }
     deleteRecord(evt){
-        let ind = $(evt.target).attr('data');
+        let id = $(evt.target).attr('data');
         $.ajax({
             type : 'POST',
-            url : 'http://networkshool.xuedianyun.com/recordingMeeting/deleteRecordingMeeting.do',
+            url : 'http://networkshool.xuedianyun.com/3m/recordingMeeting/findPageBySid.do',
             dataType: "text",
-            data: "recordingMeeting.id=" + id + "&temp=" + new Date().getTime(),
+            data: "recordingMeeting.id=" + id +"&temp="+new Date().getTime(),
             success : function(_data){
-                loger.log('_data','删除回放数据')
+                loger.log(_data,'删除回放数据')
             },
             error: function () {
                 loger.log("Request.failed !");
--- a/src/ape/SubscribeApe.js
查看文件 @30f6fc7
+++ b/src/ape/SubscribeApe.js
查看文件 @30f6fc7
@@ -56,7 +56,7 @@ class SubscribeApe extends Ape {
             headers: {siteId:ClassDataProxy.siteId,
                 'token':ClassDataProxy.token},
             success:function(_data){
-                let arr = ['收藏成功！','预约成功！','报名成功！']
+                let arr = ['收藏','预约','报名']
                 //获取课堂数据
                 loger.log(_data,'预约信息')
                 if(_data && _data.code == 200){
@@ -66,10 +66,10 @@ class SubscribeApe extends Ape {
                     that._emit(MessageTypes.ORDER_FINISH);
                 }else if(_data.returnData.data.msg == '您已预约这堂课' && ClassDataProxy.loginName){
                     ClassDataProxy.getMarginTopHandler($('#warnHintBox'));
-                    ErrorApe.showWarnError('您已预约这堂课');
+                    ErrorApe.showWarnError('您已'+arr[status]+'这堂课');
                 }else {
                     ClassDataProxy.getMarginTopHandler($('#warnHintBox'));
-                    ErrorApe.showWarnError('预约失败,请稍后再试~');
+                    ErrorApe.showWarnError(arr[status]+'失败,请稍后再试~');
                 }
             },
             error:function(error){
--- a/src/main.js
查看文件 @30f6fc7
+++ b/src/main.js
查看文件 @30f6fc7
@@ -70,7 +70,7 @@ let _headSwitchTitleApe;
 class Main {
     constructor() {
-        this.clientVersion="v1.9.0.20171012";
+        this.clientVersion="v1.9.1.20171017";
         loger.warn("clientVersion:"+this.clientVersion);
         let locationProtocol= location.protocol;
@@ -162,6 +162,7 @@ class Main {
         _myCenterApe.on(MessageTypes.ROLE_MESSAGE,this.roleMessage.bind(this));//myCenter 我的个人信息
         _myCenterApe.on(MessageTypes.MY_COURSES,this.myCoures.bind(this));//我的课程
         _myCenterApe.on(MessageTypes.MY_BOOKINGS,this.myBookings.bind(this));//我的预约
+        
         //个人中心 我的课程
         _myCoursesApe = new MyCoursesApe();
         //个人中心 我的预约
@@ -377,7 +378,7 @@ class Main {
         let userPhoto = window.localStorage.getItem('userPhoto')|| '';
         let password = window.localStorage.getItem('password')|| '';
-
+        let userRole = window.localStorage.getItem('userRole')|| 0;//身份
         ClassDataProxy.userType = parseInt(userType);
         ClassDataProxy.loginName = loginName;
         ClassDataProxy.id = id;
@@ -389,7 +390,8 @@ class Main {
         ClassDataProxy.status = status;
         ClassDataProxy.token = token;
         ClassDataProxy.userPhoto = userPhoto;
-        ClassDataProxy.password = password
+        ClassDataProxy.password = password;
+        ClassDataProxy.userRole = userRole;
         loger.log('进入课堂时显示的type值',ClassDataProxy.userType)
         switch (parseInt(userType)){
--- a/src/proxy/ClassDataProxy.js
查看文件 @30f6fc7
+++ b/src/proxy/ClassDataProxy.js
查看文件 @30f6fc7
@@ -336,7 +336,7 @@ ClassDataProxy.userName = "";
 ClassDataProxy.userId = "0";
 ClassDataProxy.password = "";
 ClassDataProxy.nodeId = 0;
-ClassDataProxy.userRole = "normal";
+ClassDataProxy.userRole = 0;
 ClassDataProxy.autoLogin = "";
 ClassDataProxy.userType = 0;