董佳音 / networkSchool

转到一个项目
Toggle navigation Toggle navigation pinning
董佳音
f488a942 1 parent 329cda68

修改登录显示个人信息数据-----0927

内嵌 并排对比
正在显示 17 个修改的文件 包含 613 行增加 和 265 行删除
@@ -373,7 +373,7 @@ body{ @@ -373,7 +373,7 @@ body{
373 float: left; 373 float: left;
374 width: 100%; 374 width: 100%;
375 font-size: 22px; 375 font-size: 22px;
376 - margin: 60px 0 26px 0; 376 + margin-top: 60px;
377 } 377 }
378 .classifyListContent{ 378 .classifyListContent{
379 width: 100%; 379 width: 100%;
@@ -696,6 +696,12 @@ body{ @@ -696,6 +696,12 @@ body{
696 float: left; 696 float: left;
697 margin-right:20px; 697 margin-right:20px;
698 } 698 }
  699 +.classManagementRightContent{
  700 + height:380px;
  701 +}
  702 +.classManagementRightContent0{
  703 + height: 420px;
  704 +}
699 .recordUl{ 705 .recordUl{
700 width: 200px; 706 width: 200px;
701 text-align: center; 707 text-align: center;
@@ -715,8 +721,13 @@ body{ @@ -715,8 +721,13 @@ body{
715 .recordLiCheck{ 721 .recordLiCheck{
716 color: #3498db; 722 color: #3498db;
717 } 723 }
  724 +.classManagementRightMian{
  725 + float: left;
  726 + height: 535px;
  727 +}
718 .classManagementRight{ 728 .classManagementRight{
719 width: 998px; 729 width: 998px;
  730 + height: 535px;
720 float: left; 731 float: left;
721 display: none; 732 display: none;
722 } 733 }
@@ -811,9 +822,6 @@ body{ @@ -811,9 +822,6 @@ body{
811 font-size: 12px; 822 font-size: 12px;
812 text-align: center; 823 text-align: center;
813 } 824 }
814 -.classManagementRightContent{  
815 - height: 420px;  
816 -}  
817 .t_box{ 825 .t_box{
818 border:1px solid #e6e6e6; 826 border:1px solid #e6e6e6;
819 border-bottom: none; 827 border-bottom: none;
@@ -916,9 +924,6 @@ body{ @@ -916,9 +924,6 @@ body{
916 position: absolute; 924 position: absolute;
917 left:0; 925 left:0;
918 top:0; 926 top:0;
919 - right: 0;  
920 - bottom: 0;  
921 - margin: 0 auto;  
922 background: #fff; 927 background: #fff;
923 } 928 }
924 .createClassHandler{ 929 .createClassHandler{
@@ -1024,7 +1029,7 @@ body{ @@ -1024,7 +1029,7 @@ body{
1024 width: 125px; 1029 width: 125px;
1025 padding-right: 5px; 1030 padding-right: 5px;
1026 text-align: right; 1031 text-align: right;
1027 - line-height: 32px; 1032 + line-height: 30px;
1028 } 1033 }
1029 .step_page1_widget{ 1034 .step_page1_widget{
1030 margin-left: 125px; 1035 margin-left: 125px;
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 <li class="header_listMsg" id="liveBtn" data="最新直播课程">直播课堂</li> 18 <li class="header_listMsg" id="liveBtn" data="最新直播课程">直播课堂</li>
19 <li class="header_listMsg header_listTeacherMsg" id="lanclassBtn" data="最新互动课程">互动课堂</li> 19 <li class="header_listMsg header_listTeacherMsg" id="lanclassBtn" data="最新互动课程">互动课堂</li>
20 <li class="header_listMsg header_listTeacherMsg" id="teacherBtn" data="推荐老师">老师</li> 20 <li class="header_listMsg header_listTeacherMsg" id="teacherBtn" data="推荐老师">老师</li>
  21 + <li class="header_listMsg header_listTeacherMsg" id="homeCenterBtn">个人中心</li>
21 </ul> 22 </ul>
22 <div class="header_seek" id="header_seek"> 23 <div class="header_seek" id="header_seek">
23 <input type="text" class="header_seekInput"> 24 <input type="text" class="header_seekInput">
@@ -414,7 +415,7 @@ @@ -414,7 +415,7 @@
414 <div class="liveInfoCenterLiveCase liveInfoCenterLiveEnd" id="liveInfoCenterLiveEnd0"></div> 415 <div class="liveInfoCenterLiveCase liveInfoCenterLiveEnd" id="liveInfoCenterLiveEnd0"></div>
415 </div> 416 </div>
416 </div> 417 </div>
417 - <div class="classManagementRightContent" id="courseContent0"> 418 + <div class="classManagementRightContent classManagementRightContent0" id="courseContent0">
418 </div> 419 </div>
419 <div class="classHandlerPageBox" id="classHandlerPageBox0"> 420 <div class="classHandlerPageBox" id="classHandlerPageBox0">
420 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> 421 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
@@ -557,7 +558,7 @@ @@ -557,7 +558,7 @@
557 <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn4" src="images/nav_link_14.png" alt=""> 558 <img class="liveInfoRightInputBtn" id="liveInfoRightInputBtn4" src="images/nav_link_14.png" alt="">
558 </div> 559 </div>
559 </div> 560 </div>
560 - <div class="classManagementRightContent" id="courseContent4"> 561 + <div class="classManagementRightContent classManagementRightContent0" id="courseContent4">
561 </div> 562 </div>
562 <div class="classHandlerPageBox" id="classHandlerPageBox4"> 563 <div class="classHandlerPageBox" id="classHandlerPageBox4">
563 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> 564 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
@@ -604,7 +605,7 @@ @@ -604,7 +605,7 @@
604 <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div> 605 <div class="liveInfoCenterLiveCase" id="liveInfoCenterLiveEnd5"></div>
605 </div> 606 </div>
606 </div> 607 </div>
607 - <div class="classManagementRightContent" id="courseContent5"> 608 + <div class="classManagementRightContent classManagementRightContent0" id="courseContent5">
608 </div> 609 </div>
609 <div class="classHandlerPageBox" id="classHandlerPageBox5"> 610 <div class="classHandlerPageBox" id="classHandlerPageBox5">
610 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> 611 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
@@ -653,45 +654,14 @@ @@ -653,45 +654,14 @@
653 </div> 654 </div>
654 <div class="classManagementRightContent" id="courseContent6"> 655 <div class="classManagementRightContent" id="courseContent6">
655 </div> 656 </div>
656 - <div class="classHandlerPageBox" id="classHandlerPageBox6">  
657 - <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">  
658 - <tbody>  
659 - <tr>  
660 - <td height="60" colspan="11" class="tr_bottom" style="">  
661 - <span class="classHandlerPageMsg" id="classHandlerPageMsg6" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>  
662 - <ul class="classHandlerPageInfoBox">  
663 - <li class="classHandlerPageInfo">  
664 - <span class="classHandlerHomePage" id="classHandlerHomePage6">首页</span>  
665 - </li>  
666 - <li class="classHandlerPageInfo">  
667 - <span class="classHandlerUpPage" id="classHandlerUpPage6">上一页</span>  
668 - </li>  
669 - <li class="classHandlerPageInfo">  
670 - <span class="classHandlerDownPage" id="classHandlerDownPage6">下一页</span>  
671 - </li>  
672 - <li class="classHandlerPageInfo">  
673 - <span class="classHandlerEndPage" id="classHandlerEndPage6">尾页</span>  
674 - </li>  
675 - <li class="classHandlerPageInfo">  
676 - <input id="classHandlerPageInfoInput6" class="classHandlerPageInfoInput" type="text">  
677 - </li>  
678 - <li class="classHandlerPageInfo classHandlerPageInfoCheck">  
679 - <span id="classHandlerSpecificPage6">GO</span>  
680 - </li>  
681 - </ul>  
682 - </td>  
683 - </tr>  
684 - </tbody>  
685 - </table>  
686 - </div>  
687 </div> 657 </div>
688 <div class="classManagementRight" id="classManagementRight7"> 658 <div class="classManagementRight" id="classManagementRight7">
689 <div class="classManagementRightTitle" id="classManagementRightTitle7"> 659 <div class="classManagementRightTitle" id="classManagementRightTitle7">
690 660
691 </div> 661 </div>
692 - <div class="classManagementRightContent" id="courseContent7"> 662 + <div class="classManagementRightContent classManagementRightContent0" id="courseContent7">
693 </div> 663 </div>
694 - <div class="classHandlerPageBox" id="classHandlerPageBox7"> 664 + <div class="classHandlerPageBox" id="classHandlerPageBox7" style="display:none">
695 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0"> 665 <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
696 <tbody> 666 <tbody>
697 <tr> 667 <tr>
@@ -1400,8 +1370,8 @@ @@ -1400,8 +1370,8 @@
1400 <img class="teacherMyCenterImg" src="images/u373.png" alt=""> 1370 <img class="teacherMyCenterImg" src="images/u373.png" alt="">
1401 <p class="teacherMyCenterInfoBox"> 1371 <p class="teacherMyCenterInfoBox">
1402 <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span> 1372 <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span>
1403 - <span id="teacherMyCenterName">小明同学</span>  
1404 - <span id="teacherMyCenterStatus">小明同学</span> 1373 + <span id="teacherMyCenterName"></span>
  1374 + <span id="teacherMyCenterStatus"></span>
1405 </p> 1375 </p>
1406 </div> 1376 </div>
1407 <div class="teacherMyCenter2"> 1377 <div class="teacherMyCenter2">
@@ -1429,8 +1399,8 @@ @@ -1429,8 +1399,8 @@
1429 <div class="myCenterContentTitleBox"> 1399 <div class="myCenterContentTitleBox">
1430 <ul class="liveInfoLeft" id="teacherInfoList"> 1400 <ul class="liveInfoLeft" id="teacherInfoList">
1431 <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">正在直播</li> 1401 <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">正在直播</li>
1432 - <li class="liveInfoLeftLi" data="0">未开始</li>  
1433 - <li class="liveInfoLeftLi" data="2">已结束</li> 1402 + <li class="liveInfoLeftLi" data="2">未开始</li>
  1403 + <li class="liveInfoLeftLi" data="4">已结束</li>
1434 </ul> 1404 </ul>
1435 </div> 1405 </div>
1436 <div class="myCenterContentList" id="teacherMyCenterContentList"> 1406 <div class="myCenterContentList" id="teacherMyCenterContentList">
@@ -1477,17 +1447,7 @@ @@ -1477,17 +1447,7 @@
1477 </ul> 1447 </ul>
1478 </div> 1448 </div>
1479 <div class="myCenterContentList" id="studentMyCenterContentList"> 1449 <div class="myCenterContentList" id="studentMyCenterContentList">
1480 - <div class="myCenterTopRightContent">&nbsp;&nbsp;暂无课程！</div>  
1481 - <div class="classifyListMyCenter">  
1482 - <div class="myCenterContentMask">  
1483 - <button class="myCenterContentMaskBtn btnHover" data="1560071471">进入学习</button>  
1484 - </div>  
1485 - <img class="myCenterContentListImg" src="images/u373.png" alt="">  
1486 - <p class="myCenterContentListTit">初一英语阅读理解习题课</p>  
1487 - <p class="myCenterContentListTit1">主讲人：方圆</p>  
1488 - <p class="myCenterContentMin">45min</p>  
1489 - <span class="myCenterContentTimer">2016-09-12</span>  
1490 - </div> 1450 +
1491 </div> 1451 </div>
1492 </div> 1452 </div>
1493 </div> 1453 </div>
@@ -1567,6 +1527,37 @@ @@ -1567,6 +1527,37 @@
1567 <div class="teacherCorrelatedInfoBtn">更多课程</div> 1527 <div class="teacherCorrelatedInfoBtn">更多课程</div>
1568 </div> 1528 </div>
1569 </div> 1529 </div>
  1530 + <div class="classHandlerPageBox" id="coursePageBox">
  1531 + <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
  1532 + <tbody>
  1533 + <tr>
  1534 + <td height="60" colspan="11" class="tr_bottom" style="">
  1535 + <span class="classHandlerPageMsg" id="coursePageMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
  1536 + <ul class="classHandlerPageInfoBox">
  1537 + <li class="classHandlerPageInfo">
  1538 + <span class="classHandlerHomePage" id="courseHomePage">首页</span>
  1539 + </li>
  1540 + <li class="classHandlerPageInfo">
  1541 + <span class="classHandlerUpPage" id="courseUpPage">上一页</span>
  1542 + </li>
  1543 + <li class="classHandlerPageInfo">
  1544 + <span class="classHandlerDownPage" id="courseDownPage">下一页</span>
  1545 + </li>
  1546 + <li class="classHandlerPageInfo">
  1547 + <span class="classHandlerEndPage" id="courseEndPage">尾页</span>
  1548 + </li>
  1549 + <li class="classHandlerPageInfo">
  1550 + <input id="coursePageInfoInput" class="classHandlerPageInfoInput" type="text">
  1551 + </li>
  1552 + <li class="classHandlerPageInfo classHandlerPageInfoCheck">
  1553 + <span id="courseSpecificPage">GO</span>
  1554 + </li>
  1555 + </ul>
  1556 + </td>
  1557 + </tr>
  1558 + </tbody>
  1559 + </table>
  1560 + </div>
1570 </div> 1561 </div>
1571 <!--个人信息--> 1562 <!--个人信息-->
1572 <div class="myCenterContentBox myCenterContentBox1"> 1563 <div class="myCenterContentBox myCenterContentBox1">
@@ -1586,9 +1577,9 @@ @@ -1586,9 +1577,9 @@
1586 </li> 1577 </li>
1587 <li class="oneselfInfoList"> 1578 <li class="oneselfInfoList">
1588 <label class="oneselfInfoHeader">年龄</label> 1579 <label class="oneselfInfoHeader">年龄</label>
1589 - <input class="oneselfInfoInput" id="oneselfInfoAge" type="text"> 1580 + <input class="oneselfInfoInput" id="oneselfInfoAge" placeholder="保密" type="text">
1590 </li> 1581 </li>
1591 - <li class="oneselfInfoList"> 1582 + <li class="oneselfInfoList" style="display: none">
1592 <label class="oneselfInfoHeader">性别</label> 1583 <label class="oneselfInfoHeader">性别</label>
1593 <input class="allowPublic allowPublicDetail" id="oneselfInfoMan" name="videoQuality" type="radio" value="0" checked="checked"> 1584 <input class="allowPublic allowPublicDetail" id="oneselfInfoMan" name="videoQuality" type="radio" value="0" checked="checked">
1594 <label for="oneselfInfoMan"> 1585 <label for="oneselfInfoMan">
@@ -1724,7 +1715,7 @@ @@ -1724,7 +1715,7 @@
1724 <div class="userSignBox" id="removeHandlerBox" style="display: none;"> 1715 <div class="userSignBox" id="removeHandlerBox" style="display: none;">
1725 <div class="usersign removeHandler" id="removeHandler"> 1716 <div class="usersign removeHandler" id="removeHandler">
1726 <a href="javascript: void(0)" id="removeHandlerA" class="usersignA iconfont">&#xe638;</a> 1717 <a href="javascript: void(0)" id="removeHandlerA" class="usersignA iconfont">&#xe638;</a>
1727 - <div class="removeHandlerContent"> 1718 + <div class="removeHandlerContent" id="removeHandlerContent">
1728 确定删除吗？ 1719 确定删除吗？
1729 </div> 1720 </div>
1730 <div class="removeHandlerBtn"> 1721 <div class="removeHandlerBtn">
@@ -7,7 +7,7 @@ function MessageTypes() {} @@ -7,7 +7,7 @@ function MessageTypes() {}
7 //--------------------事件相关的定义-------------------------------------- 7 //--------------------事件相关的定义--------------------------------------
8 //登陆相关 8 //登陆相关
9 MessageTypes.LOGIN_OUT= "login_out"; //更新用户退出 9 MessageTypes.LOGIN_OUT= "login_out"; //更新用户退出
10 -MessageTypes.LOGIN_IN= "login_in"; //更新用户退出 10 +MessageTypes.LOGIN_IN= "login_in"; //更新用户登录
11 11
12 12
13 //header按钮 13 //header按钮
@@ -31,8 +31,9 @@ MessageTypes.ORDER_FINISH= "order_finish"; //预约成功 @@ -31,8 +31,9 @@ MessageTypes.ORDER_FINISH= "order_finish"; //预约成功
31 MessageTypes.LOGIN_MYCENTER= "login_mycenter"; //预约成功 31 MessageTypes.LOGIN_MYCENTER= "login_mycenter"; //预约成功
32 MessageTypes.MY_COURSES= "my_courses"; //我的课程 32 MessageTypes.MY_COURSES= "my_courses"; //我的课程
33 MessageTypes.MY_BOOKINGS= "my_bookings"; //我的预约 33 MessageTypes.MY_BOOKINGS= "my_bookings"; //我的预约
34 -  
35 MessageTypes.ROLE_MESSAGE= "role_message"; //我的信息 34 MessageTypes.ROLE_MESSAGE= "role_message"; //我的信息
36 35
  36 +MessageTypes.IS_COLLECT= "is_collect"; //是否收藏
  37 +
37 export default MessageTypes; 38 export default MessageTypes;
38 39
@@ -30,7 +30,7 @@ class CollectApe extends Ape { @@ -30,7 +30,7 @@ class CollectApe extends Ape {
30 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting'; 30 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
31 let status = $(evt.currentTarget).attr('data'); 31 let status = $(evt.currentTarget).attr('data');
32 let id = $('#lanclassBox').attr('data'); 32 let id = $('#lanclassBox').attr('data');
33 - loger.log('收藏数据信息',status) 33 + loger.log('收藏数据信息',status,id)
34 let data = {siteId:ClassDataProxy.siteId, 34 let data = {siteId:ClassDataProxy.siteId,
35 "studentId":ClassDataProxy.id, 35 "studentId":ClassDataProxy.id,
36 "status":parseInt(status), 36 "status":parseInt(status),
@@ -48,19 +48,28 @@ class CollectApe extends Ape { @@ -48,19 +48,28 @@ class CollectApe extends Ape {
48 _collectYesHandler(evt){ 48 _collectYesHandler(evt){
49 let that = this; 49 let that = this;
50 50
51 - let status = $(evt.currentTarget).attr('data');  
52 let id = $('#lanclassBox').attr('data'); 51 let id = $('#lanclassBox').attr('data');
53 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+id; 52 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+id;
54 - let data = {  
55 - status:7  
56 - }  
57 - this.detailPage(_url,data,function(_data){  
58 - if(_data && _data.code == 200){  
59 - that._collectYesClick();  
60 - ErrorApe.showWarnError('取消收藏');  
61 - loger.log('收藏数据信息',_data) 53 + $.ajax({
  54 + type: "PUT",
  55 + url: _url,
  56 + timeout:5000,
  57 + headers: {
  58 + siteId:ClassDataProxy.siteId,
  59 + 'token':ClassDataProxy.token
  60 + },
  61 + data:{status:parseInt(status)},
  62 + success:function(_data){
  63 + //获取课堂数据
  64 + if(_data && _data.code == 200){
  65 + that._collectYesClick();
  66 + ClassDataProxy.getMarginTopHandler($('#warnHintBox'));
  67 + ErrorApe.showWarnError('取消收藏');
  68 + }
  69 + },
  70 + error:function(error){
  71 + console.log(error,'失败')
62 } 72 }
63 -  
64 }) 73 })
65 } 74 }
66 detailPage(url,data,callback){ 75 detailPage(url,data,callback){
@@ -73,7 +82,8 @@ class CollectApe extends Ape { @@ -73,7 +82,8 @@ class CollectApe extends Ape {
73 'token':ClassDataProxy.token}, 82 'token':ClassDataProxy.token},
74 success:function(_data){ 83 success:function(_data){
75 //获取我的课程数据 84 //获取我的课程数据
76 - if(_data && _data.code == 200){ 85 + loger.log('收藏数据信息',_data)
  86 + if(_data && _data.code){
77 if(callback){ 87 if(callback){
78 callback(_data); 88 callback(_data);
79 } 89 }
@@ -91,6 +101,21 @@ class CollectApe extends Ape { @@ -91,6 +101,21 @@ class CollectApe extends Ape {
91 } 101 }
92 }) 102 })
93 } 103 }
  104 + isCollect(id){
  105 + let that = this;
  106 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
  107 + let data = {siteId:ClassDataProxy.siteId,
  108 + "studentId":ClassDataProxy.id,
  109 + "status":6,
  110 + "meetingId":id
  111 + }
  112 + this.detailPage(_url,data,function(_data){
  113 + loger.log('您已收藏这堂课',_data)
  114 + if(_data.returnData.data.msg == '您已收藏这堂课'){
  115 + that._collectNoClick();
  116 + }
  117 + })
  118 + }
94 toLogin(){ 119 toLogin(){
95 $('#userLoginBox').show(); 120 $('#userLoginBox').show();
96 } 121 }
@@ -65,6 +65,7 @@ class CreateClassApe extends Ape { @@ -65,6 +65,7 @@ class CreateClassApe extends Ape {
65 $('#meeting_endhour').find("option[value = '"+ hoursEnd +"']").attr("selected","selected"); 65 $('#meeting_endhour').find("option[value = '"+ hoursEnd +"']").attr("selected","selected");
66 } 66 }
67 _createClassBtnHandler(){ 67 _createClassBtnHandler(){
  68 + ClassDataProxy.getMarginTopHandler($('#createClass'));//显示预约成功弹框
68 $('#createClassBox').show(); 69 $('#createClassBox').show();
69 $('#scheduleForm1').show(); 70 $('#scheduleForm1').show();
70 $('#scheduleForm2').hide(); 71 $('#scheduleForm2').hide();
@@ -208,10 +208,12 @@ class CreateGradeApe extends Ape { @@ -208,10 +208,12 @@ class CreateGradeApe extends Ape {
208 } 208 }
209 //创建班级 209 //创建班级
210 _addClassBtnHandler(){ 210 _addClassBtnHandler(){
  211 + ClassDataProxy.getMarginTopHandler($('#createGrade'));//显示预约成功弹框
211 $('#createGradeBox').show(); 212 $('#createGradeBox').show();
212 } 213 }
213 //管理班级 214 //管理班级
214 _manageClassBtnHandler(){ 215 _manageClassBtnHandler(){
  216 + ClassDataProxy.getMarginTopHandler($('#manageClass'));//显示预约成功弹框
215 $('#manageClassBox').show(); 217 $('#manageClassBox').show();
216 } 218 }
217 //关闭创建班级 219 //关闭创建班级
@@ -198,10 +198,12 @@ class CreateUserApe extends Ape { @@ -198,10 +198,12 @@ class CreateUserApe extends Ape {
198 } 198 }
199 //用户管理 199 //用户管理
200 _addUserBtnHandler(){ 200 _addUserBtnHandler(){
  201 + ClassDataProxy.getMarginTopHandler($('#createUserAccount'));//显示预约成功弹框
201 $('#createUserAccountBox').show(); 202 $('#createUserAccountBox').show();
202 } 203 }
203 _createUserYesHandler(){ 204 _createUserYesHandler(){
204 $('#createUserAccountBox').hide(); 205 $('#createUserAccountBox').hide();
  206 + ClassDataProxy.getMarginTopHandler($('#createUser'));//显示预约成功弹框
205 $('#createUserBox').show(); 207 $('#createUserBox').show();
206 let val = $('#createUserRole').val(); 208 let val = $('#createUserRole').val();
207 let name = ''; 209 let name = '';
@@ -259,10 +261,12 @@ class CreateUserApe extends Ape { @@ -259,10 +261,12 @@ class CreateUserApe extends Ape {
259 //注册成功后 跳转登录界面 261 //注册成功后 跳转登录界面
260 if(_data && _data.code == 200){ 262 if(_data && _data.code == 200){
261 loger.log(_data,'注册老师账号成功') 263 loger.log(_data,'注册老师账号成功')
  264 + ClassDataProxy.getMarginTopHandler($('#warnHintBox'));//修改信息输入框
262 ErrorApe.showWarnError('注册成功'); 265 ErrorApe.showWarnError('注册成功');
263 $('#createUserBox').hide(); 266 $('#createUserBox').hide();
264 that.userAdminHandler(1); 267 that.userAdminHandler(1);
265 }else{ 268 }else{
  269 + ClassDataProxy.getMarginTopHandler($('#warnHintBox'));//修改信息输入框
266 ErrorApe.showWarnError(_data.returnData.data.msg); 270 ErrorApe.showWarnError(_data.returnData.data.msg);
267 } 271 }
268 }, 272 },
@@ -43,13 +43,14 @@ class HomeApe extends Ape { @@ -43,13 +43,14 @@ class HomeApe extends Ape {
43 $('#liveBtnMove').on('click',this.liveBtnMoveHandler.bind(this)); 43 $('#liveBtnMove').on('click',this.liveBtnMoveHandler.bind(this));
44 $('#lanclassBtnMove').on('click',this.lanclassBtnMoveHandler.bind(this)); 44 $('#lanclassBtnMove').on('click',this.lanclassBtnMoveHandler.bind(this));
45 $('#teacherBtnMove').on('click',this.teacherBtnMoveHandler.bind(this)); 45 $('#teacherBtnMove').on('click',this.teacherBtnMoveHandler.bind(this));
  46 +
  47 + $('#homeCenterBtn').on('click',this._homeCenterBtnHandler.bind(this));
46 } 48 }
47 49
48 addEvent() { 50 addEvent() {
49 51
50 } 52 }
51 isLocalStorage(){ 53 isLocalStorage(){
52 - $('#myCenterBox').hide();  
53 this.homeAllDate(); 54 this.homeAllDate();
54 } 55 }
55 switchHeaderHandler(evt){ 56 switchHeaderHandler(evt){
@@ -156,15 +157,6 @@ class HomeApe extends Ape { @@ -156,15 +157,6 @@ class HomeApe extends Ape {
156 } 157 }
157 }) 158 })
158 } 159 }
159 - studentClick(){  
160 - $('#slideshow').show();  
161 - $('#defaultBox').show();  
162 - $('.curriculumBox').show();  
163 - $('#classifyListBox').hide();  
164 - $('#teacherDetailBox').hide();  
165 - $('#lanclassBox').hide();  
166 - $('#myCenterBox').hide();  
167 - }  
168 _liveClassData(_data){ 160 _liveClassData(_data){
169 let liveList = $('#liveList'); 161 let liveList = $('#liveList');
170 liveList.empty(); 162 liveList.empty();
@@ -240,6 +232,27 @@ class HomeApe extends Ape { @@ -240,6 +232,27 @@ class HomeApe extends Ape {
240 lanclassList.append(_classifyList) 232 lanclassList.append(_classifyList)
241 teacherIntro.append(_classifyList) 233 teacherIntro.append(_classifyList)
242 } 234 }
  235 +
  236 + //首页点击 进入个人中心
  237 + _homeCenterBtnHandler(){
  238 + if(ClassDataProxy.userType == 0){
  239 + this.toLogin();
  240 + }else{
  241 + $('#slideshow').hide();
  242 + $('#defaultBox').hide();
  243 + $('#classifyListBox').hide();
  244 + $('#lanclassBox').hide();
  245 + $('#liveContentAllBox').hide();
  246 + $('#lanclassAllBox').hide();
  247 + $('#teacherIntroAllBox').hide();
  248 + $('#teacherDetailBox').hide();
  249 + $('#myCenterBox').show();
  250 + }
  251 + }
  252 + toLogin(){
  253 + ClassDataProxy.getMarginTopHandler($('#userLogin'));
  254 + $('#userLoginBox').show();
  255 + }
243 //工具类 256 //工具类
244 _format(str, obj) { 257 _format(str, obj) {
245 return str.replace(/\{(\w+)\}/g, function (match, group, index) { 258 return str.replace(/\{(\w+)\}/g, function (match, group, index) {
@@ -72,7 +72,7 @@ class LanclassApe extends Ape { @@ -72,7 +72,7 @@ class LanclassApe extends Ape {
72 if(_data && _data.code == 200){ 72 if(_data && _data.code == 200){
73 //切换列表内容 73 //切换列表内容
74 that._classDateContent(_data.returnData.data); 74 that._classDateContent(_data.returnData.data);
75 - loger.log(_data,'成功') 75 + // loger.log(_data,'成功')
76 } 76 }
77 }, 77 },
78 error:function(error){ 78 error:function(error){
@@ -6,6 +6,7 @@ import Loger from "../Loger"; @@ -6,6 +6,7 @@ import Loger from "../Loger";
6 import Ape from "./Ape"; 6 import Ape from "./Ape";
7 import $ from "jquery"; 7 import $ from "jquery";
8 import ClassDataProxy from "proxy/ClassDataProxy"; 8 import ClassDataProxy from "proxy/ClassDataProxy";
  9 +import MessageTypes from "../MessageTypes";
9 10
10 let loger = Loger.getLoger('PC-ListDetailsApe'); 11 let loger = Loger.getLoger('PC-ListDetailsApe');
11 class ListDetailsApe extends Ape { 12 class ListDetailsApe extends Ape {
@@ -42,6 +43,8 @@ class ListDetailsApe extends Ape { @@ -42,6 +43,8 @@ class ListDetailsApe extends Ape {
42 this._id = _id; 43 this._id = _id;
43 this.classInfoDetail(_id); 44 this.classInfoDetail(_id);
44 this.commonalityClass(); 45 this.commonalityClass();
  46 + //查看当前点击的列表是否收藏
  47 + this._emit(MessageTypes.IS_COLLECT,{id : _id});
45 } 48 }
46 _liveListHandler(evt){ 49 _liveListHandler(evt){
47 let _id = $(evt.currentTarget).attr('data'); 50 let _id = $(evt.currentTarget).attr('data');
@@ -57,11 +60,10 @@ class ListDetailsApe extends Ape { @@ -57,11 +60,10 @@ class ListDetailsApe extends Ape {
57 $('#teacherIntroAllBox').hide(); 60 $('#teacherIntroAllBox').hide();
58 } 61 }
59 _teacherInfoHandler(evt){ 62 _teacherInfoHandler(evt){
60 - this.commonalityClass();  
61 -  
62 let _id = $(evt.currentTarget).attr('data'); 63 let _id = $(evt.currentTarget).attr('data');
63 this._id = _id; 64 this._id = _id;
64 this.teacherInfoDetail(_id); 65 this.teacherInfoDetail(_id);
  66 + this.commonalityClass();
65 } 67 }
66 classInfoDetail(_id){ 68 classInfoDetail(_id){
67 let that = this; 69 let that = this;
@@ -110,7 +112,6 @@ class ListDetailsApe extends Ape { @@ -110,7 +112,6 @@ class ListDetailsApe extends Ape {
110 let _dataList = _data.meetingInfo; 112 let _dataList = _data.meetingInfo;
111 if(_dataList){ 113 if(_dataList){
112 this._liveRender(_dataList[0]); 114 this._liveRender(_dataList[0]);
113 - loger.log('课堂信息信息',_dataList)  
114 } 115 }
115 } 116 }
116 } 117 }
@@ -118,13 +119,14 @@ class ListDetailsApe extends Ape { @@ -118,13 +119,14 @@ class ListDetailsApe extends Ape {
118 if(_data){ 119 if(_data){
119 let teacherList = _data.users; 120 let teacherList = _data.users;
120 if(teacherList){ 121 if(teacherList){
  122 + loger.log('老师1111',teacherList)
121 this._lanclassRender(teacherList[0]); 123 this._lanclassRender(teacherList[0]);
122 - loger.log('课堂信息信息',teacherList)  
123 } 124 }
124 } 125 }
125 } 126 }
126 //老师 127 //老师
127 _lanclassRender(_dataList){ 128 _lanclassRender(_dataList){
  129 + loger.log('老师1111',_dataList)
128 $('#defaultBox').hide(); 130 $('#defaultBox').hide();
129 $('.curriculumBox').hide(); 131 $('.curriculumBox').hide();
130 $('#teacherDetailBox').show(); 132 $('#teacherDetailBox').show();
@@ -85,6 +85,7 @@ class LoginOrRegister extends Ape { @@ -85,6 +85,7 @@ class LoginOrRegister extends Ape {
85 } 85 }
86 //首页用户登录 86 //首页用户登录
87 _homeUserLoginBtnHandler(){ 87 _homeUserLoginBtnHandler(){
  88 + $('#homeUserLoginBtn').attr('data',1)
88 if(!window.localStorage.getItem('status')){ 89 if(!window.localStorage.getItem('status')){
89 ClassDataProxy.getMarginTopHandler($('#userLogin')); 90 ClassDataProxy.getMarginTopHandler($('#userLogin'));
90 $('#userLoginBox').show(); 91 $('#userLoginBox').show();
@@ -104,7 +105,7 @@ class LoginOrRegister extends Ape { @@ -104,7 +105,7 @@ class LoginOrRegister extends Ape {
104 this.updateInterfaceState(); 105 this.updateInterfaceState();
105 this._emit(MessageTypes.LOGIN_OUT); 106 this._emit(MessageTypes.LOGIN_OUT);
106 ClassDataProxy.getMarginTopHandler($('#warnHintBox')); 107 ClassDataProxy.getMarginTopHandler($('#warnHintBox'));
107 - ErrorApe.showWarnError('退出成功'); 108 + ErrorApe.showWarnError('退出成功',1);
108 } 109 }
109 clearLocalStorage(){ 110 clearLocalStorage(){
110 window.localStorage.clear(); 111 window.localStorage.clear();
@@ -368,10 +369,21 @@ class LoginOrRegister extends Ape { @@ -368,10 +369,21 @@ class LoginOrRegister extends Ape {
368 $('#teacherMyCenterName').text( ClassDataProxy.loginName); 369 $('#teacherMyCenterName').text( ClassDataProxy.loginName);
369 this._userLoginAHandler(); 370 this._userLoginAHandler();
370 this._emit(MessageTypes.LOGIN_IN,{userType: ClassDataProxy.userType}); 371 this._emit(MessageTypes.LOGIN_IN,{userType: ClassDataProxy.userType});
371 - this._emit(MessageTypes.LOGIN_MYCENTER);  
372 } 372 }
373 updateChangeUser(_data){ 373 updateChangeUser(_data){
  374 + let _isMyCenter = $('#homeUserLoginBtn').attr('data');
374 375
  376 + if(parseInt(_isMyCenter) == 1){
  377 + $('#slideshow').hide();
  378 + $('#defaultBox').hide();
  379 + $('#classifyListBox').hide();
  380 + $('#lanclassBox').hide();
  381 + $('#liveContentAllBox').hide();
  382 + $('#lanclassAllBox').hide();
  383 + $('#teacherIntroAllBox').hide();
  384 + $('#teacherDetailBox').hide();
  385 + }
  386 + $('#myCenterBox').show();
375 // loger.log('登录成功后更改用户名',_data) 387 // loger.log('登录成功后更改用户名',_data)
376 let _dataList = _data.returnData.data; 388 let _dataList = _data.returnData.data;
377 let oneselfInfoLoginName = $('#oneselfInfoLoginName');//登录名 389 let oneselfInfoLoginName = $('#oneselfInfoLoginName');//登录名
@@ -53,6 +53,8 @@ class MyBookingsApe extends Ape { @@ -53,6 +53,8 @@ class MyBookingsApe extends Ape {
53 this.dataList = {}; 53 this.dataList = {};
54 this.teacherList = {}; 54 this.teacherList = {};
55 this.presentInd = 1;//点击翻页默认为第一页 55 this.presentInd = 1;//点击翻页默认为第一页
  56 + this.pageNo = 0;
  57 + this.orderId = 0;
56 this.addEvent(); 58 this.addEvent();
57 this.init(); 59 this.init();
58 } 60 }
@@ -78,57 +80,116 @@ class MyBookingsApe extends Ape { @@ -78,57 +80,116 @@ class MyBookingsApe extends Ape {
78 80
79 $('#teacherCorrelatedInfo').on('click','.teacherCorrelatedInfoBtn',this._teacherSubscribeMoveHandler.bind(this));//点击预约查看当前点击的更多信息 81 $('#teacherCorrelatedInfo').on('click','.teacherCorrelatedInfoBtn',this._teacherSubscribeMoveHandler.bind(this));//点击预约查看当前点击的更多信息
80 82
81 - $('#teacherCorrelatedInfo').on('click','.cancelReservation',this._cancelSubscribeHandler.bind(this));//取消预约 83 + $('#teacherCorrelatedInfo').on('click','.cancelReservation',this._cancelReservationBtn.bind(this));//取消预约
  84 + $('#removeCancel').on('click',this._removeCancelHandler.bind(this));//取消预约 取消
  85 + $('#removeConfirm').on('click',this._removeConfirmHandler.bind(this));//取消预约 确定
82 86
83 $('#teacherCorrelatedInfo').on('click','.teachercourseImg',this._teacherClassDetails.bind(this));//点击进入老师课堂详情页 87 $('#teacherCorrelatedInfo').on('click','.teachercourseImg',this._teacherClassDetails.bind(this));//点击进入老师课堂详情页
84 88
  89 + $('#courseHomePage').on('click',this._homePageHandler.bind(this));//首页
  90 + $('#courseUpPage').on('click',this._upPageHandler.bind(this));//上页
  91 + $('#courseDownPage').on('click',this._downPageHandler.bind(this));//下页
  92 + $('#courseEndPage').on('click',this._endPageHandler.bind(this));//尾页
  93 + $('#courseSpecificPage').on('click',this._assignPageHandler.bind(this));//指定页
  94 +
85 } 95 }
86 96
87 addEvent() { 97 addEvent() {
88 98
89 } 99 }
  100 + //首页
  101 + _homePageHandler(){
  102 + this.presentInd = 1;
  103 + this.studentBookings(this.presentInd);
  104 + }
  105 + //上页
  106 + _upPageHandler(){
  107 + if(this.presentInd > 1){
  108 + this.presentInd--;
  109 + this.studentBookings(this.presentInd);
  110 + }
  111 + }
  112 + //下页
  113 + _downPageHandler(){
  114 + loger.log('点击下一页')
  115 + if(this.presentInd < this.pageNo){
  116 + this.presentInd++;
  117 + this.studentBookings(this.presentInd);
  118 + }
  119 + }
  120 + //尾页
  121 + _endPageHandler(){
  122 + this.presentInd = this.pageNo;
  123 + this.studentBookings(this.presentInd);
  124 + }
  125 + //指定页
  126 + _assignPageHandler(){
  127 + let inputVal = $('#classHandlerPageInfoInput').val();
  128 + if(parseInt(inputVal) <= this.pageNo || parseInt(inputVal) >= 1 ){
  129 + this.studentBookings(parseInt(inputVal));
  130 + }
  131 + }
90 //我的预约 132 //我的预约
91 myBookingsMessage(){ 133 myBookingsMessage(){
  134 + let subscribeList = $('#subscribeList');
  135 + this._anewLoad(subscribeList)
92 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ 136 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){
93 - this.studentBookings(); 137 + this.studentBookings(1);
94 } 138 }
95 } 139 }
96 - studentBookings(){ 140 + _anewLoad(ele){
  141 + ele.find('.liveInfoLeftLi').eq(0).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck')
  142 + }
  143 + studentBookings(ind){
97 let that = this; 144 let that = this;
98 let data = $('#subscribeList').find('.liveInfoLeftLiCheck').attr('data'); 145 let data = $('#subscribeList').find('.liveInfoLeftLiCheck').attr('data');
99 - this._studentCurriculumInfo(12,function(_data){  
100 - if(_data){  
101 - if(data == '1'){  
102 - that._studentSubscribeTeacher(_data.returnData.data)  
103 - }else{ 146 + if(parseInt(data) == 1){
  147 + this._studentCurriculumInfo(32,ind,function(_data){
  148 + that._studentSubscribeTeacher(_data.returnData.data)
  149 + })
  150 + }else{
  151 + this._studentCurriculumInfo(12,ind,function(_data){
  152 + if(_data){
104 that._studentSubscribe(_data.returnData.data) 153 that._studentSubscribe(_data.returnData.data)
105 } 154 }
106 - }  
107 - }); 155 + })
  156 + }
108 } 157 }
109 _studentSubscribe(_data){ 158 _studentSubscribe(_data){
110 let teacherCorrelatedInfo = $('#teacherCorrelatedInfo'); 159 let teacherCorrelatedInfo = $('#teacherCorrelatedInfo');
111 teacherCorrelatedInfo.empty(); 160 teacherCorrelatedInfo.empty();
112 - for(let i = 0;i<_data.length;i++){  
113 - if(_data[i]){  
114 - let j = (i%4)==3;  
115 - let _classifyList = this._format(classifyList,{  
116 - _classifyListR : j?'classifyListR':'',  
117 - _isShowTitle : 'none',  
118 - _meetingNumber : _data[i].meetingNumber,  
119 - _msgImg : '../images/u373.png',  
120 - _meetingName : _data[i].meeting_name,  
121 - _create_user : _data[i].teacherName,  
122 - _liveTimer : _data[i].meetingBeginTime.split(' ')[0],  
123 - _studentMeetingId : _data[i].studentMeetingId  
124 - })  
125 - teacherCorrelatedInfo.append(_classifyList) 161 + if(_data){
  162 +
  163 + // let count = _data.count;
  164 + // let page = _data.page;
  165 + // let pageno = _data.pageno;
  166 + // let pagenum = Math.ceil(count / pageno);
  167 + //let _dataList = _data.meetingInfo;
  168 + // this.pageNo = pagenum;
126 169
127 - }else{  
128 - console.error('_gainClassData没数据') 170 + $('#coursePageBox').hide();
  171 + for(let i = 0;i<_data.length;i++){
  172 + if(_data[i]){
  173 + let j = (i%4)==3;
  174 + let _classifyList = this._format(classifyList,{
  175 + _classifyListR : j?'classifyListR':'',
  176 + _isShowTitle : 'none',
  177 + _meetingNumber : _data[i].meetingNumber,
  178 + _msgImg : '../images/u373.png',
  179 + _meetingName : _data[i].meeting_name,
  180 + _create_user : _data[i].teacherName,
  181 + _liveTimer : _data[i].meetingBeginTime.split(' ')[0],
  182 + _studentMeetingId : _data[i].studentMeetingId
  183 + })
  184 + teacherCorrelatedInfo.append(_classifyList)
  185 +
  186 + }else{
  187 + console.error('_gainClassData没数据')
  188 + }
129 } 189 }
130 } 190 }
131 191
  192 +
132 } 193 }
133 _studentSubscribeTeacher(_data){ 194 _studentSubscribeTeacher(_data){
134 let teacherCorrelatedInfo = $('#teacherCorrelatedInfo'); 195 let teacherCorrelatedInfo = $('#teacherCorrelatedInfo');
@@ -149,26 +210,45 @@ class MyBookingsApe extends Ape { @@ -149,26 +210,45 @@ class MyBookingsApe extends Ape {
149 let teacherInfo = '' 210 let teacherInfo = ''
150 let arrList = this.teacherList[key]; 211 let arrList = this.teacherList[key];
151 teacherInfo = this._format(teacherInfoLeft,{ 212 teacherInfo = this._format(teacherInfoLeft,{
152 - _teacherName : key,  
153 - // meetingNumber 213 + _teacherName : key
154 }) 214 })
155 for(let n = 0;n<arrList.length;n++){ 215 for(let n = 0;n<arrList.length;n++){
156 - teacherInfo += this._format(teacherInfoCenter,{  
157 - _imgSrc : 'images/u374.png',  
158 - _id : arrList[n].teacherName  
159 - }) 216 + if(n<2){
  217 + teacherInfo += this._format(teacherInfoCenter,{
  218 + _imgSrc : 'images/u374.png',
  219 + _id : arrList[n].teacherName
  220 + })
  221 + }
160 } 222 }
161 teacherInfo += this._format(teacherInfoRight,{ 223 teacherInfo += this._format(teacherInfoRight,{
162 _teacherName : key, 224 _teacherName : key,
163 - // _meetingId : 225 + _meetingId :arrList[0].meetingId
164 }) 226 })
165 teacherCorrelatedInfo.append(teacherInfo) 227 teacherCorrelatedInfo.append(teacherInfo)
166 } 228 }
167 } 229 }
168 } 230 }
169 - //取消预约  
170 - _cancelSubscribeHandler(evt){ 231 + _cancelReservationBtn(evt){
171 let _id = $(evt.target).attr('data'); 232 let _id = $(evt.target).attr('data');
  233 + this.orderId = _id;
  234 + ClassDataProxy.getMarginTopHandler($('#removeHandler'));
  235 + $("#removeHandlerBox").show();
  236 + $('#removeHandlerContent').html('确定要取消预约吗？');
  237 + }
  238 + _removeCancelHandler(){
  239 + this._hideRemoveBox();
  240 + }
  241 + _removeConfirmHandler(){
  242 + this._cancelSubscribeHandler(this.orderId);
  243 + this._hideRemoveBox();
  244 + }
  245 + _hideRemoveBox(){
  246 + $("#removeHandlerBox").hide();
  247 + $('#removeHandlerContent').html('');
  248 + }
  249 + //取消预约
  250 + _cancelSubscribeHandler(_id){
  251 +
172 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+_id; 252 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+_id;
173 let that = this; 253 let that = this;
174 $.ajax({ 254 $.ajax({
@@ -207,6 +287,8 @@ class MyBookingsApe extends Ape { @@ -207,6 +287,8 @@ class MyBookingsApe extends Ape {
207 $('#lanclassContentInfoTimeEnd').html('结束时间：'+_data.meetingEndTime); 287 $('#lanclassContentInfoTimeEnd').html('结束时间：'+_data.meetingEndTime);
208 } 288 }
209 _teacherSubscribeMoveHandler(evt){ 289 _teacherSubscribeMoveHandler(evt){
  290 + let _id = $(evt.target).attr('value');
  291 + $('#teacherDetailBox').attr('data',_id);
210 $('#teacherDetailBox').show(); 292 $('#teacherDetailBox').show();
211 $('#myCenterBox').hide(); 293 $('#myCenterBox').hide();
212 294
@@ -255,17 +337,17 @@ class MyBookingsApe extends Ape { @@ -255,17 +337,17 @@ class MyBookingsApe extends Ape {
255 let ind = $(evt.target).attr('data'); 337 let ind = $(evt.target).attr('data');
256 window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + ind); 338 window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + ind);
257 } 339 }
258 - _studentCurriculumInfo(num,callback){ 340 + _studentCurriculumInfo(num,ind,callback){
259 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/getStudentMeetingByStudentId/'+ClassDataProxy.id; 341 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/getStudentMeetingByStudentId/'+ClassDataProxy.id;
260 let that = this; 342 let that = this;
261 $.ajax({ 343 $.ajax({
262 type: "GET", 344 type: "GET",
263 url: _url, 345 url: _url,
264 timeout:5000, 346 timeout:5000,
265 - headers: {siteId:ClassDataProxy.siteId,pageno:num,id:ClassDataProxy.id, 347 + headers: {siteId:ClassDataProxy.siteId,pageno:num,page:ind,id:ClassDataProxy.id,
266 'token':ClassDataProxy.token}, 348 'token':ClassDataProxy.token},
267 success:function(_data){ 349 success:function(_data){
268 - 350 + // loger.log('预约信息斯柯达开始',_data)
269 //获取我的课程数据 351 //获取我的课程数据
270 if(_data && _data.code == 200){ 352 if(_data && _data.code == 200){
271 if(callback){ 353 if(callback){
@@ -15,7 +15,7 @@ const classifyList = `<div class="courseMinuteListTimeTit" style="display: {_isS @@ -15,7 +15,7 @@ const classifyList = `<div class="courseMinuteListTimeTit" style="display: {_isS
15 </div> 15 </div>
16 <div class="classifyListMyCenter {_classifyListR}"> 16 <div class="classifyListMyCenter {_classifyListR}">
17 <div class="myCenterContentMask accessLearningBtn"> 17 <div class="myCenterContentMask accessLearningBtn">
18 - <button class="myCenterContentMaskBtn btnHover" data="{_meetingNumber}">进入学习</button> 18 + <button class="myCenterContentMaskBtn btnHover" data="{_meetingNumber}">{_studyMsg}</button>
19 </div> 19 </div>
20 <div class="myCenterContentMask cancelReservation"> 20 <div class="myCenterContentMask cancelReservation">
21 <button class="myCenterContentMaskBtn btnHover" data="{_studentMeetingId}">取消预约</button> 21 <button class="myCenterContentMaskBtn btnHover" data="{_studentMeetingId}">取消预约</button>
@@ -86,8 +86,7 @@ class MyCenterApe extends Ape { @@ -86,8 +86,7 @@ class MyCenterApe extends Ape {
86 this.messageDetails = []; 86 this.messageDetails = [];
87 this.presentInd = 1;//点击翻页默认为第一页 87 this.presentInd = 1;//点击翻页默认为第一页
88 this.pageNo = 0; //首页老师端 直播默认页码 88 this.pageNo = 0; //首页老师端 直播默认页码
89 - this.pageNo1 = 0; //首页老师端 课程默认页码  
90 - this.pageNo2 = 0; //首页老师端 课程默认页码 89 + this.pageNo1 = 1; //首页老师端 课程默认页码
91 this._judgeListPlace(); 90 this._judgeListPlace();
92 this.addEvent(); 91 this.addEvent();
93 this.init(); 92 this.init();
@@ -108,22 +107,143 @@ class MyCenterApe extends Ape { @@ -108,22 +107,143 @@ class MyCenterApe extends Ape {
108 } 107 }
109 108
110 addEvent() { 109 addEvent() {
111 -  
112 } 110 }
113 //首页 111 //首页
114 - _createClassHomePage(){  
115 - this._teacherLiveModule(1); 112 + _homePageHandler(){
  113 + this.presentInd = 1;
  114 + let ind = $('#teacherMyCerterPageBox').attr('data');
  115 + switch (parseInt(ind)){
  116 + case 1:
  117 + this._teacherLiveModule(this.presentInd);
  118 + break;
  119 + case 2:
  120 + this._teacherNoneLiveModule(this.presentInd);
  121 + break;
  122 + case 4:
  123 + this._teacherEndLiveModule(this.presentInd);
  124 + break;
  125 + default:
  126 + return;
  127 + }
  128 + }
  129 + //上页
  130 + _upPageHandler(){
  131 + if(this.presentInd > 1){
  132 + this.presentInd--;
  133 + let ind = $('#teacherMyCerterPageBox').attr('data');
  134 + switch (parseInt(ind)){
  135 + case 1:
  136 + this._teacherLiveModule(this.presentInd);
  137 + break;
  138 + case 2:
  139 + this._teacherNoneLiveModule(this.presentInd);
  140 + break;
  141 + case 4:
  142 + this._teacherEndLiveModule(this.presentInd);
  143 + break;
  144 + default:
  145 + return;
  146 + }
  147 + }
  148 + }
  149 + //下页
  150 + _downPageHandler(){
  151 + loger.log('点击下一页')
  152 + if(this.presentInd < this.pageNo){
  153 + this.presentInd++;
  154 + let ind = $('#teacherMyCerterPageBox').attr('data');
  155 + switch (parseInt(ind)){
  156 + case 1:
  157 + this._teacherLiveModule(this.presentInd);
  158 + break;
  159 + case 2:
  160 + this._teacherNoneLiveModule(this.presentInd);
  161 + break;
  162 + case 4:
  163 + this._teacherEndLiveModule(this.presentInd);
  164 + break;
  165 + default:
  166 + return;
  167 + }
  168 + }
  169 + }
  170 + //尾页
  171 + _endPageHandler(){
  172 + this.presentInd = this.pageNo;
  173 + let ind = $('#teacherMyCerterPageBox').attr('data');
  174 + switch (parseInt(ind)){
  175 + case 1:
  176 + this._teacherLiveModule(this.presentInd);
  177 + break;
  178 + case 2:
  179 + this._teacherNoneLiveModule(this.presentInd);
  180 + break;
  181 + case 4:
  182 + this._teacherEndLiveModule(this.presentInd);
  183 + break;
  184 + default:
  185 + return;
  186 + }
  187 + }
  188 + //指定页
  189 + _assignPageHandler(){
  190 + let inputVal = $('#teacherMyCerterPageInfoInput').val();
  191 + if(parseInt(inputVal) <= this.pageNo || parseInt(inputVal) >= 1 ){
  192 + let ind = $('#teacherMyCerterPageBox').attr('data');
  193 + switch (parseInt(ind)){
  194 + case 1:
  195 + this._teacherLiveModule(parseInt(inputVal));
  196 + break;
  197 + case 2:
  198 + this._teacherNoneLiveModule(parseInt(inputVal));
  199 + break;
  200 + case 4:
  201 + this._teacherEndLiveModule(parseInt(inputVal));
  202 + break;
  203 + default:
  204 + return;
  205 + }
  206 + }
  207 + }
  208 + detailpage(){
  209 + this._showStatus();
116 } 210 }
117 //首页 211 //首页
118 _homePageHandler(){ 212 _homePageHandler(){
119 this.presentInd = 1; 213 this.presentInd = 1;
120 - this._teacherLiveModule(this.presentInd); 214 + let ind = $('#teacherMyCerterPageBox').attr('data');
  215 + switch (parseInt(ind)){
  216 + case 1:
  217 + this._teacherLiveModule(this.presentInd);
  218 + break;
  219 + case 2:
  220 + this._teacherNoneLiveModule(this.presentInd);
  221 + break;
  222 + case 4:
  223 + this._teacherEndLiveModule(this.presentInd);
  224 + break;
  225 + default:
  226 + return;
  227 + }
121 } 228 }
122 //上页 229 //上页
123 _upPageHandler(){ 230 _upPageHandler(){
124 if(this.presentInd > 1){ 231 if(this.presentInd > 1){
125 this.presentInd--; 232 this.presentInd--;
126 - this._teacherLiveModule(this.presentInd); 233 + let ind = $('#teacherMyCerterPageBox').attr('data');
  234 + switch (parseInt(ind)){
  235 + case 1:
  236 + this._teacherLiveModule(this.presentInd);
  237 + break;
  238 + case 2:
  239 + this._teacherNoneLiveModule(this.presentInd);
  240 + break;
  241 + case 4:
  242 + this._teacherEndLiveModule(this.presentInd);
  243 + break;
  244 + default:
  245 + return;
  246 + }
127 } 247 }
128 } 248 }
129 //下页 249 //下页
@@ -131,19 +251,58 @@ class MyCenterApe extends Ape { @@ -131,19 +251,58 @@ class MyCenterApe extends Ape {
131 loger.log('点击下一页') 251 loger.log('点击下一页')
132 if(this.presentInd < this.pageNo){ 252 if(this.presentInd < this.pageNo){
133 this.presentInd++; 253 this.presentInd++;
134 - this._teacherLiveModule(this.presentInd); 254 + let ind = $('#teacherMyCerterPageBox').attr('data');
  255 + switch (parseInt(ind)){
  256 + case 1:
  257 + this._teacherLiveModule(this.presentInd);
  258 + break;
  259 + case 2:
  260 + this._teacherNoneLiveModule(this.presentInd);
  261 + break;
  262 + case 4:
  263 + this._teacherEndLiveModule(this.presentInd);
  264 + break;
  265 + default:
  266 + return;
  267 + }
135 } 268 }
136 } 269 }
137 //尾页 270 //尾页
138 _endPageHandler(){ 271 _endPageHandler(){
139 this.presentInd = this.pageNo; 272 this.presentInd = this.pageNo;
140 - this._teacherLiveModule(this.presentInd); 273 + let ind = $('#teacherMyCerterPageBox').attr('data');
  274 + switch (parseInt(ind)){
  275 + case 1:
  276 + this._teacherLiveModule(this.presentInd);
  277 + break;
  278 + case 2:
  279 + this._teacherNoneLiveModule(this.presentInd);
  280 + break;
  281 + case 4:
  282 + this._teacherEndLiveModule(this.presentInd);
  283 + break;
  284 + default:
  285 + return;
  286 + }
141 } 287 }
142 //指定页 288 //指定页
143 _assignPageHandler(){ 289 _assignPageHandler(){
144 let inputVal = $('#teacherMyCerterPageInfoInput').val(); 290 let inputVal = $('#teacherMyCerterPageInfoInput').val();
145 if(parseInt(inputVal) <= this.pageNo || parseInt(inputVal) >= 1 ){ 291 if(parseInt(inputVal) <= this.pageNo || parseInt(inputVal) >= 1 ){
146 - this._teacherLiveModule(parseInt(inputVal)); 292 + let ind = $('#teacherMyCerterPageBox').attr('data');
  293 + switch (parseInt(ind)){
  294 + case 1:
  295 + this._teacherLiveModule(parseInt(inputVal));
  296 + break;
  297 + case 2:
  298 + this._teacherNoneLiveModule(parseInt(inputVal));
  299 + break;
  300 + case 4:
  301 + this._teacherEndLiveModule(parseInt(inputVal));
  302 + break;
  303 + default:
  304 + return;
  305 + }
147 } 306 }
148 } 307 }
149 loadMeeting(meeting){ 308 loadMeeting(meeting){
@@ -205,7 +364,7 @@ class MyCenterApe extends Ape { @@ -205,7 +364,7 @@ class MyCenterApe extends Ape {
205 type: "GET", 364 type: "GET",
206 url: _url, 365 url: _url,
207 timeout:5000, 366 timeout:5000,
208 - headers: {siteId:ClassDataProxy.siteId,pageno:num,id:ClassDataProxy.id, 367 + headers: {siteId:ClassDataProxy.siteId,pageno:num,id:ClassDataProxy.id,
209 'token':ClassDataProxy.token}, 368 'token':ClassDataProxy.token},
210 success:function(_data){ 369 success:function(_data){
211 370
@@ -234,7 +393,7 @@ class MyCenterApe extends Ape { @@ -234,7 +393,7 @@ class MyCenterApe extends Ape {
234 //首页课程 393 //首页课程
235 this._teacherCourseModule(); 394 this._teacherCourseModule();
236 //首页直播信息 395 //首页直播信息
237 - this._teacherLiveModule(1); 396 + this.teacherListSwitch();
238 } 397 }
239 detailPageStudent(){ 398 detailPageStudent(){
240 this._studentCourseModule(); 399 this._studentCourseModule();
@@ -260,44 +419,35 @@ class MyCenterApe extends Ape { @@ -260,44 +419,35 @@ class MyCenterApe extends Ape {
260 419
261 } 420 }
262 _showStatus(){ 421 _showStatus(){
263 - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){  
264 - $('#teacherMyCenterStatus').text('老师');  
265 - $('#teacherMyCerter').show();  
266 - $('#studentMyCerter').hide();  
267 - }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){  
268 - $('#teacherMyCenterStatus').text('同学');  
269 - $('#teacherMyCerter').hide();  
270 - $('#studentMyCerter').show();  
271 - }  
272 - }  
273 - isLocalStorage(){  
274 let newDate = new Date(); 422 let newDate = new Date();
275 let newHours = newDate.getHours(); 423 let newHours = newDate.getHours();
276 let text = newHours>12?'下午好,':'上午好,' 424 let text = newHours>12?'下午好,':'上午好,'
277 $('#teacherMyCenterTime').text(text); 425 $('#teacherMyCenterTime').text(text);
278 - this._showStatus();  
279 426
280 - this.detailpage();  
281 - loger.log('登录老师首页',ClassDataProxy.userType , ClassDataProxy.USER_TYPE_1) 427 + $('#myCenterBox').show();
  428 + $('#teacherMyCenterName').text(ClassDataProxy.loginName);
282 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ 429 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
283 - //首页默认数据  
284 - // this.detailPageTeacher();  
285 - $('#teacherMyCenterName').text(ClassDataProxy.loginName);  
286 $('#teacherMyCenterStatus').text('老师'); 430 $('#teacherMyCenterStatus').text('老师');
287 - $('#teacherUI .recordLi').eq(2).hide();  
288 $('#teacherMyCerter').show(); 431 $('#teacherMyCerter').show();
289 $('#studentMyCerter').hide(); 432 $('#studentMyCerter').hide();
290 - $('#myCenterBox').show(); 433 + $('#teacherUI .recordLi').eq(2).hide();
  434 + this.detailPageTeacher();
  435 +
291 }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ 436 }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){
292 - //首页默认数据  
293 - // this.detailPageStudent();  
294 - $('#myCenterBox').show();  
295 - $('#teacherMyCenterName').text(ClassDataProxy.loginName);  
296 $('#teacherMyCenterStatus').text('同学'); 437 $('#teacherMyCenterStatus').text('同学');
297 $('#teacherMyCerter').hide(); 438 $('#teacherMyCerter').hide();
298 $('#studentMyCerter').show(); 439 $('#studentMyCerter').show();
299 $('#teacherUI .recordLi').eq(2).show(); 440 $('#teacherUI .recordLi').eq(2).show();
  441 + this.detailPageStudent();
  442 +
300 } 443 }
  444 + }
  445 + isLocalStorage(){
  446 + this.detailpage();
  447 + if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
  448 + $('#myCenterBox').show();
  449 + }
  450 + loger.log('登录老师首页',ClassDataProxy.userType , ClassDataProxy.USER_TYPE_1)
301 451
302 $('#lanclassBox').hide(); 452 $('#lanclassBox').hide();
303 453
@@ -337,15 +487,32 @@ class MyCenterApe extends Ape { @@ -337,15 +487,32 @@ class MyCenterApe extends Ape {
337 return; 487 return;
338 } 488 }
339 } 489 }
340 - detailpage(){  
341 - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){  
342 - this.detailPageTeacher();  
343 - }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){  
344 - this.detailPageStudent();  
345 - }  
346 - } 490 +
347 491
348 /*-------------------老师-------------------*/ 492 /*-------------------老师-------------------*/
  493 + teacherListSwitch(){
  494 + let ind = $('#teacherInfoList .liveInfoLeftLiCheck').attr('data');
  495 + $('#teacherMyCerterPageBox').attr('data',ind)
  496 + let teacherMyCenterContentList = $('#teacherMyCenterContentList');
  497 + let status = parseInt(ind);
  498 + switch (status){
  499 + case 1:
  500 + //正在直播
  501 + this._teacherLiveModule(1);
  502 + break;
  503 + case 2:
  504 + //未开始
  505 + this._teacherNoneLiveModule(1);
  506 + break;
  507 + case 4:
  508 + //已结束
  509 + this._teacherEndLiveModule(1);
  510 + break;
  511 + default:
  512 + return;
  513 + }
  514 +
  515 + }
349 //老师端首页课程显示 516 //老师端首页课程显示
350 _teacherCourseModule(){ 517 _teacherCourseModule(){
351 let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName}; 518 let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName};
@@ -365,12 +532,13 @@ class MyCenterApe extends Ape { @@ -365,12 +532,13 @@ class MyCenterApe extends Ape {
365 if(_data) { 532 if(_data) {
366 for (let i = 0; i < _data.length; i++) { 533 for (let i = 0; i < _data.length; i++) {
367 let item = _data[i]; 534 let item = _data[i];
  535 + let timer = ClassDataProxy.getTimeCountDown(item.meetingBeginTime,item.meetingEndTime)
368 if (item) { 536 if (item) {
369 let curInfo = this._format(curriculumList, { 537 let curInfo = this._format(curriculumList, {
370 _infoTit: item.meetingName, 538 _infoTit: item.meetingName,
371 _meetingNumber: item.meetingNumber, 539 _meetingNumber: item.meetingNumber,
372 _countDown: that.loadMeeting(item), 540 _countDown: that.loadMeeting(item),
373 - _isShow: (that.loadMeeting(item) == '已开始') ? 'block' : 'none' 541 + _isShow: (timer == '已结束') ? 'none' : 'block'
374 }) 542 })
375 myCurriculumInfo.append(curInfo); 543 myCurriculumInfo.append(curInfo);
376 } else { 544 } else {
@@ -391,33 +559,64 @@ class MyCenterApe extends Ape { @@ -391,33 +559,64 @@ class MyCenterApe extends Ape {
391 } 559 }
392 }) 560 })
393 } 561 }
  562 + _teacherNoneLiveModule(ind){
  563 + let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName,meetingStatus:2};
  564 + let that = this;
  565 + this._teacherCurriculumInfo(data,4,ind,function(_data){
  566 + //首页直播信息渲染
  567 + if(_data){
  568 + that._teacherLiveCourse(_data.returnData.data);
  569 + }
  570 + })
  571 + }
  572 + _teacherEndLiveModule(ind){
  573 + let data = {siteId:ClassDataProxy.siteId,create_user : ClassDataProxy.loginName,meetingStatus:4};
  574 + let that = this;
  575 + this._teacherCurriculumInfo(data,4,ind,function(_data){
  576 + //首页直播信息渲染
  577 + if(_data){
  578 + that._teacherLiveCourse(_data.returnData.data);
  579 + }
  580 + })
  581 + }
394 _teacherLiveCourse(_data){ 582 _teacherLiveCourse(_data){
395 let teacherMyCenterContentList = $('#teacherMyCenterContentList'); 583 let teacherMyCenterContentList = $('#teacherMyCenterContentList');
396 teacherMyCenterContentList.empty(); 584 teacherMyCenterContentList.empty();
397 -  
398 - let count = _data.count;  
399 - let page = _data.page;  
400 - let pageno = _data.pageno;  
401 - let pagenum = Math.ceil(count / pageno);  
402 - let _dataList = _data.meetingInfo;  
403 - this.pageNo = pagenum;  
404 - $('#teacherMyCerterPageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');  
405 - teacherMyCenterContentList.append(adminListTit)  
406 - for(let i = 0;i<_dataList.length;i++){  
407 - if(count <= 8){  
408 - $('#teacherMyCerterPageBox').hide(); 585 + if(_data){
  586 + let count = _data.count;
  587 + let page = _data.page;
  588 + let pageno = _data.pageno;
  589 + let pagenum = Math.ceil(count / pageno);
  590 + let _dataList = _data.meetingInfo;
  591 + this.pageNo = pagenum;
  592 + if(_dataList.length > 0){
  593 + // loger.log('正在直播状态',_data)
  594 +
  595 + $('#teacherMyCerterPageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
  596 + if(count <= 4){
  597 + $('#teacherMyCerterPageBox').hide();
  598 + }
  599 + teacherMyCenterContentList.append(adminListTit)
  600 + for(let i = 0;i<_dataList.length;i++){
  601 + let _adminList = this._format(adminList,{
  602 + _meetingName : _dataList[i].meetingName,
  603 + _meetingNumber : _dataList[i].meetingNumber,
  604 + _create_user : _dataList[i].create_user,
  605 + _state : ClassDataProxy.getTimeEnd(_dataList[i].beginTime,_dataList[i].endTime),
  606 + _timer : _dataList[i].beginTime + '-' + _dataList[i].endTime,
  607 + _num : '0'
  608 + })
  609 + teacherMyCenterContentList.append(_adminList)
  610 + }
  611 + teacherMyCenterContentList.append(adminListEnd)
  612 + }else{
  613 + let _classifyList = '<div class="dataCenterErrorTitle">暂无数据～</div>';
  614 + teacherMyCenterContentList.append(_classifyList)
409 } 615 }
410 - let _adminList = this._format(adminList,{  
411 - _meetingName : _dataList[i].meetingName,  
412 - _meetingNumber : _dataList[i].meetingNumber,  
413 - _create_user : _dataList[i].create_user,  
414 - _state : ClassDataProxy.getTimeEnd(_dataList[i].beginTime,_dataList[i].endTime),  
415 - _timer : _dataList[i].beginTime + '-' + _dataList[i].endTime,  
416 - _num : '0'  
417 - })  
418 - teacherMyCenterContentList.append(_adminList) 616 + }else{
  617 + loger.log('shujuweikong')
419 } 618 }
420 - teacherMyCenterContentList.append(adminListEnd) 619 +
421 } 620 }
422 621
423 /*---------------------------学生-----------------------*/ 622 /*---------------------------学生-----------------------*/
@@ -476,6 +675,7 @@ class MyCenterApe extends Ape { @@ -476,6 +675,7 @@ class MyCenterApe extends Ape {
476 let _classifyList = this._format(classifyList,{ 675 let _classifyList = this._format(classifyList,{
477 _classifyListR : j?'classifyListR':'', 676 _classifyListR : j?'classifyListR':'',
478 _isShowTitle : 'none', 677 _isShowTitle : 'none',
  678 + _studyMsg:'进入学习',
479 _meetingNumber : _data[i].meetingNumber, 679 _meetingNumber : _data[i].meetingNumber,
480 _msgImg : '../images/u373.png', 680 _msgImg : '../images/u373.png',
481 _meetingName : _data[i].meeting_name, 681 _meetingName : _data[i].meeting_name,
@@ -483,7 +683,6 @@ class MyCenterApe extends Ape { @@ -483,7 +683,6 @@ class MyCenterApe extends Ape {
483 _liveTimer : _data[i].meetingBeginTime.split(' ')[0] 683 _liveTimer : _data[i].meetingBeginTime.split(' ')[0]
484 }) 684 })
485 studentMyCenterContentList.append(_classifyList) 685 studentMyCenterContentList.append(_classifyList)
486 - }else{  
487 recordData = 1; 686 recordData = 1;
488 } 687 }
489 }else{ 688 }else{
@@ -491,8 +690,8 @@ class MyCenterApe extends Ape { @@ -491,8 +690,8 @@ class MyCenterApe extends Ape {
491 } 690 }
492 } 691 }
493 } 692 }
494 - if(recordData == 1){  
495 - let _classifyList = '<div class="dataCenterErrorTitle">暂无数据～</div>' 693 + if(recordData == 0){
  694 + let _classifyList = '<div class="dataCenterErrorTitle">暂无数据～</div>';
496 studentMyCenterContentList.append(_classifyList) 695 studentMyCenterContentList.append(_classifyList)
497 } 696 }
498 697
@@ -514,6 +713,7 @@ class MyCenterApe extends Ape { @@ -514,6 +713,7 @@ class MyCenterApe extends Ape {
514 let _classifyList = this._format(classifyList,{ 713 let _classifyList = this._format(classifyList,{
515 _classifyListR : j?'classifyListR':'', 714 _classifyListR : j?'classifyListR':'',
516 _isShowTitle : 'none', 715 _isShowTitle : 'none',
  716 + _studyMsg:'继续学习',
517 _meetingNumber : _data[i].meetingNumber, 717 _meetingNumber : _data[i].meetingNumber,
518 _msgImg : '../images/u373.png', 718 _msgImg : '../images/u373.png',
519 _meetingName : _data[i].meeting_name, 719 _meetingName : _data[i].meeting_name,
@@ -568,7 +768,6 @@ class MyCenterApe extends Ape { @@ -568,7 +768,6 @@ class MyCenterApe extends Ape {
568 768
569 } 769 }
570 770
571 -  
572 //老师端课程数据 771 //老师端课程数据
573 _teacherCourseRender(_data){ 772 _teacherCourseRender(_data){
574 let courseMinuteList = $('#courseMinuteList'); 773 let courseMinuteList = $('#courseMinuteList');
@@ -616,31 +815,8 @@ class MyCenterApe extends Ape { @@ -616,31 +815,8 @@ class MyCenterApe extends Ape {
616 } 815 }
617 } 816 }
618 //学生端 我的课程 切换 817 //学生端 我的课程 切换
619 - //老师端首页显示课程  
620 - _teacherHomeCourse(_data){  
621 - let myCurriculumInfo = $('#myCurriculumInfo');  
622 - myCurriculumInfo.empty();  
623 - if(_data){  
624 - for(let i = 0;i < 3;i++){  
625 - let item = _data[i];  
626 - if(item){  
627 - let curInfo = this._format(curriculumList,{  
628 - _infoTit : item.meetingName,  
629 - _meetingNumber : item.meetingNumber,  
630 - _countDown : that.loadMeeting(item),  
631 - _isShow : (that.loadMeeting(item)=='已开始')?'block':'none'  
632 - })  
633 - myCurriculumInfo.append(curInfo);  
634 - }else{  
635 - console.error('_gainClassData没数据')  
636 - }  
637 -  
638 - }  
639 - }  
640 - }  
641 _myCenterBoxHandler(){ 818 _myCenterBoxHandler(){
642 - this._showStatus();  
643 - this.detailpage(); 819 +
644 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_2){ 820 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_2){
645 return; 821 return;
646 } 822 }
@@ -658,7 +834,6 @@ class MyCenterApe extends Ape { @@ -658,7 +834,6 @@ class MyCenterApe extends Ape {
658 834
659 } 835 }
660 $('#myCenterBox').show(); 836 $('#myCenterBox').show();
661 -  
662 } 837 }
663 updateEmail(userEmail){ 838 updateEmail(userEmail){
664 return userEmail.replace(/(\d{2})\d{2}(\d{1})/, '$1****$2') 839 return userEmail.replace(/(\d{2})\d{2}(\d{1})/, '$1****$2')
@@ -682,6 +857,7 @@ class MyCenterApe extends Ape { @@ -682,6 +857,7 @@ class MyCenterApe extends Ape {
682 } 857 }
683 _teacherInfoListHandler(evt){ 858 _teacherInfoListHandler(evt){
684 this.commonality(evt); 859 this.commonality(evt);
  860 + this.teacherListSwitch();
685 } 861 }
686 //学生端 首页 862 //学生端 首页
687 _studentInfoListHandler(evt){ 863 _studentInfoListHandler(evt){
@@ -15,7 +15,7 @@ const classifyList = `<div class="courseMinuteListTimeTit" style="display: {_isS @@ -15,7 +15,7 @@ const classifyList = `<div class="courseMinuteListTimeTit" style="display: {_isS
15 </div> 15 </div>
16 <div class="classifyListMyCenter {_classifyListR}"> 16 <div class="classifyListMyCenter {_classifyListR}">
17 <div class="myCenterContentMask accessLearningBtn"> 17 <div class="myCenterContentMask accessLearningBtn">
18 - <button class="myCenterContentMaskBtn btnHover" data="{_meetingNumber}">进入学习</button> 18 + <button class="myCenterContentMaskBtn btnHover" data="{_meetingNumber}">{_studyMsg}</button>
19 </div> 19 </div>
20 <div class="myCenterContentMask cancelReservation"> 20 <div class="myCenterContentMask cancelReservation">
21 <button class="myCenterContentMaskBtn btnHover" data="{_studentMeetingId}">取消预约</button> 21 <button class="myCenterContentMaskBtn btnHover" data="{_studentMeetingId}">取消预约</button>
@@ -110,10 +110,8 @@ class MyCoursesApe extends Ape { @@ -110,10 +110,8 @@ class MyCoursesApe extends Ape {
110 } 110 }
111 //首页 111 //首页
112 _homePageHandler(){ 112 _homePageHandler(){
113 -  
114 this.presentIndT = 1; 113 this.presentIndT = 1;
115 this.teacherNowLiveModule(this.presentIndT); 114 this.teacherNowLiveModule(this.presentIndT);
116 - loger.log('首页',this.presentIndT)  
117 } 115 }
118 //上页 116 //上页
119 _upPageHandler(){ 117 _upPageHandler(){
@@ -121,7 +119,6 @@ class MyCoursesApe extends Ape { @@ -121,7 +119,6 @@ class MyCoursesApe extends Ape {
121 this.presentIndT--; 119 this.presentIndT--;
122 this.teacherNowLiveModule(this.presentIndT); 120 this.teacherNowLiveModule(this.presentIndT);
123 } 121 }
124 - loger.log('上页',this.presentIndT)  
125 } 122 }
126 //下页 123 //下页
127 _downPageHandler(){ 124 _downPageHandler(){
@@ -130,13 +127,11 @@ class MyCoursesApe extends Ape { @@ -130,13 +127,11 @@ class MyCoursesApe extends Ape {
130 this.presentIndT++; 127 this.presentIndT++;
131 this.teacherNowLiveModule(this.presentIndT); 128 this.teacherNowLiveModule(this.presentIndT);
132 } 129 }
133 - loger.log('下页',this.presentIndT)  
134 } 130 }
135 //尾页 131 //尾页
136 _endPageHandler(){ 132 _endPageHandler(){
137 - this.presentIndT = this.pageNoT;  
138 - this.teacherNowLiveModule(this.presentIndT);  
139 - loger.log('尾页',this.presentIndT) 133 + this.presentIndT = this.pageNoT;
  134 + this.teacherNowLiveModule(this.presentIndT);
140 } 135 }
141 //指定页 136 //指定页
142 _assignPageHandler(){ 137 _assignPageHandler(){
@@ -144,20 +139,29 @@ class MyCoursesApe extends Ape { @@ -144,20 +139,29 @@ class MyCoursesApe extends Ape {
144 if(parseInt(inputVal) <= this.pageNoT || parseInt(inputVal) >= 1 ){ 139 if(parseInt(inputVal) <= this.pageNoT || parseInt(inputVal) >= 1 ){
145 this.teacherNowLiveModule(parseInt(inputVal)); 140 this.teacherNowLiveModule(parseInt(inputVal));
146 } 141 }
147 - loger.log('指定页',this.presentIndT)  
148 } 142 }
149 //我的课程 143 //我的课程
150 myCoursesMessage(){ 144 myCoursesMessage(){
  145 + let courseInfoList = $('#courseInfoList');
  146 + let teacherLiveList = $('#teacherLiveList');
151 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ 147 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
152 this.teacherCourses(); 148 this.teacherCourses();
153 - $('#courseInfoList').hide();  
154 - $('#teacherLiveList').show(); 149 + courseInfoList.hide();
  150 + teacherLiveList.show();
  151 + this._anewLoad(teacherLiveList);//默认显示第一个列表
  152 + this.teacherNowLiveModule(1);
155 }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ 153 }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){
  154 + let courseMinuteList = $('#courseMinuteList');
156 this.studentCourses(); 155 this.studentCourses();
157 - $('#courseInfoList').show();  
158 - $('#teacherLiveList').hide(); 156 + courseInfoList.show();
  157 + teacherLiveList.hide();
  158 + this._anewLoad(courseInfoList)//默认显示第一个列表
  159 + this.studentFutureModule(courseMinuteList);
159 } 160 }
160 } 161 }
  162 + _anewLoad(ele){
  163 + ele.find('.liveInfoLeftLi').eq(0).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck')
  164 + }
161 //我的 课程 直播信息 165 //我的 课程 直播信息
162 teacherCourses(){ 166 teacherCourses(){
163 let _index = $('#teacherLiveList .liveInfoLeftLiCheck').attr('data'); 167 let _index = $('#teacherLiveList .liveInfoLeftLiCheck').attr('data');
@@ -187,9 +191,8 @@ class MyCoursesApe extends Ape { @@ -187,9 +191,8 @@ class MyCoursesApe extends Ape {
187 this._teacherCurriculumInfo(data,8,ind,function(_data){ 191 this._teacherCurriculumInfo(data,8,ind,function(_data){
188 //首页直播信息渲染 192 //首页直播信息渲染
189 if(_data){ 193 if(_data){
190 - //  
191 that._teacherCourse(_data.returnData.data); 194 that._teacherCourse(_data.returnData.data);
192 - loger.log('首页直播信息渲染',_data.returnData.data) 195 + // loger.log('首页直播信息渲染',_data.returnData.data)
193 } 196 }
194 }) 197 })
195 } 198 }
@@ -261,7 +264,6 @@ class MyCoursesApe extends Ape { @@ -261,7 +264,6 @@ class MyCoursesApe extends Ape {
261 that._studentCourseRender(courseMinuteList,_data.returnData.data) 264 that._studentCourseRender(courseMinuteList,_data.returnData.data)
262 } 265 }
263 }); 266 });
264 -  
265 } 267 }
266 //学生端课程数据 待学习 268 //学生端课程数据 待学习
267 _studentCourseRender(courseMinuteList,_data){ 269 _studentCourseRender(courseMinuteList,_data){
@@ -299,6 +301,7 @@ class MyCoursesApe extends Ape { @@ -299,6 +301,7 @@ class MyCoursesApe extends Ape {
299 _classifyListR : j ?'classifyListR':'', 301 _classifyListR : j ?'classifyListR':'',
300 _isShowTitle : n == 0 ?'block':'none', 302 _isShowTitle : n == 0 ?'block':'none',
301 _meetingNumber : arrList[n].meetingNumber, 303 _meetingNumber : arrList[n].meetingNumber,
  304 + _studyMsg:'进入学习',
302 _msgImg : '../images/u373.png', 305 _msgImg : '../images/u373.png',
303 _meetingName : arrList[n].meeting_name, 306 _meetingName : arrList[n].meeting_name,
304 _create_user : arrList[n].teacherName, 307 _create_user : arrList[n].teacherName,
@@ -307,14 +310,14 @@ class MyCoursesApe extends Ape { @@ -307,14 +310,14 @@ class MyCoursesApe extends Ape {
307 courseMinuteList.append(_classifyList) 310 courseMinuteList.append(_classifyList)
308 } 311 }
309 } 312 }
310 - }else {  
311 recordData = 1; 313 recordData = 1;
312 } 314 }
313 } 315 }
314 - if(recordData == 1){ 316 + if(recordData == 0){
315 let _classifyList = '<div class="dataCenterErrorTitle">暂无数据～</div>' 317 let _classifyList = '<div class="dataCenterErrorTitle">暂无数据～</div>'
316 courseMinuteList.append(_classifyList) 318 courseMinuteList.append(_classifyList)
317 } 319 }
  320 +
318 } 321 }
319 //学生端 我的课程 已学完 322 //学生端 我的课程 已学完
320 studentFormerlyModule(courseMinuteList){ 323 studentFormerlyModule(courseMinuteList){
@@ -360,6 +363,7 @@ class MyCoursesApe extends Ape { @@ -360,6 +363,7 @@ class MyCoursesApe extends Ape {
360 let _classifyList = this._format(classifyList,{ 363 let _classifyList = this._format(classifyList,{
361 _classifyListR : j ?'classifyListR':'', 364 _classifyListR : j ?'classifyListR':'',
362 _isShowTitle : n == 0 ?'block':'none', 365 _isShowTitle : n == 0 ?'block':'none',
  366 + _studyMsg:'继续学习',
363 _meetingNumber : arrList[n].meetingNumber, 367 _meetingNumber : arrList[n].meetingNumber,
364 _msgImg : '../images/u373.png', 368 _msgImg : '../images/u373.png',
365 _meetingName : arrList[n].meeting_name, 369 _meetingName : arrList[n].meeting_name,
@@ -418,6 +422,7 @@ class MyCoursesApe extends Ape { @@ -418,6 +422,7 @@ class MyCoursesApe extends Ape {
418 let _classifyList = this._format(classifyList,{ 422 let _classifyList = this._format(classifyList,{
419 _classifyListR : j ?'classifyListR':'', 423 _classifyListR : j ?'classifyListR':'',
420 _isShowTitle : 'none', 424 _isShowTitle : 'none',
  425 + _studyMsg:'取消收藏',
421 _meetingNumber : _dataList[n].meetingNumber, 426 _meetingNumber : _dataList[n].meetingNumber,
422 _msgImg : '../images/u373.png', 427 _msgImg : '../images/u373.png',
423 _meetingName : _dataList[n].meeting_name, 428 _meetingName : _dataList[n].meeting_name,
@@ -35,15 +35,15 @@ class SubscribeApe extends Ape { @@ -35,15 +35,15 @@ class SubscribeApe extends Ape {
35 let status = $(evt.currentTarget).attr('data'); 35 let status = $(evt.currentTarget).attr('data');
36 let id = $('#teacherDetailBox').attr('data'); 36 let id = $('#teacherDetailBox').attr('data');
37 this._lanclassContentApplyHandler(status,id); 37 this._lanclassContentApplyHandler(status,id);
  38 + loger.log('查看当前点击的dataid',id,status)
38 } 39 }
39 _lanclassContentApplyHandler(status,id){ 40 _lanclassContentApplyHandler(status,id){
40 if(ClassDataProxy.userType == 0){ 41 if(ClassDataProxy.userType == 0){
41 - that.toLogin(); 42 + this.toLogin();
42 return; 43 return;
43 } 44 }
44 let that = this; 45 let that = this;
45 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting'; 46 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
46 -  
47 this.id = id; 47 this.id = id;
48 $.ajax({ 48 $.ajax({
49 type: "POST", 49 type: "POST",
@@ -58,6 +58,7 @@ class SubscribeApe extends Ape { @@ -58,6 +58,7 @@ class SubscribeApe extends Ape {
58 success:function(_data){ 58 success:function(_data){
59 let arr = ['收藏成功！','预约成功！','报名成功！'] 59 let arr = ['收藏成功！','预约成功！','报名成功！']
60 //获取课堂数据 60 //获取课堂数据
  61 + loger.log('获取课堂数据',_data)
61 if(_data && _data.code == 200){ 62 if(_data && _data.code == 200){
62 loger.log(_data,'预约信息') 63 loger.log(_data,'预约信息')
63 ClassDataProxy.getMarginTopHandler($('#teacherDetailReminders'));//显示预约成功弹框 64 ClassDataProxy.getMarginTopHandler($('#teacherDetailReminders'));//显示预约成功弹框
@@ -73,7 +74,7 @@ class SubscribeApe extends Ape { @@ -73,7 +74,7 @@ class SubscribeApe extends Ape {
73 }, 74 },
74 error:function(error){ 75 error:function(error){
75 //alert('首页数据获取失败') 76 //alert('首页数据获取失败')
76 - console.log(error,'首页数据获取失败') 77 + console.log(error,'预约数据获取失败')
77 } 78 }
78 }) 79 })
79 } 80 }
@@ -68,7 +68,7 @@ let _headSwitchTitleApe; @@ -68,7 +68,7 @@ let _headSwitchTitleApe;
68 68
69 class Main { 69 class Main {
70 constructor() { 70 constructor() {
71 - this.clientVersion="v1.8.4.20170923"; 71 + this.clientVersion="v1.8.5.20170925";
72 loger.warn("clientVersion:"+this.clientVersion); 72 loger.warn("clientVersion:"+this.clientVersion);
73 73
74 let locationProtocol= location.protocol; 74 let locationProtocol= location.protocol;
@@ -151,6 +151,23 @@ class Main { @@ -151,6 +151,23 @@ class Main {
151 _loginOrRegister = new LoginOrRegister(); 151 _loginOrRegister = new LoginOrRegister();
152 _loginOrRegister.on(MessageTypes.LOGIN_OUT,this.loginOut.bind(this)); 152 _loginOrRegister.on(MessageTypes.LOGIN_OUT,this.loginOut.bind(this));
153 _loginOrRegister.on(MessageTypes.LOGIN_IN,this.loginIn.bind(this)); 153 _loginOrRegister.on(MessageTypes.LOGIN_IN,this.loginIn.bind(this));
  154 + // _loginOrRegister.on(MessageTypes.LOGIN_MYCENTER,this.loginMycenter.bind(this));
  155 +
  156 + //个人中心
  157 + _myCenterApe = new MyCenterApe();
  158 + _myCenterApe.on(MessageTypes.ROLE_MESSAGE,this.roleMessage.bind(this));
  159 + _myCenterApe.on(MessageTypes.MY_COURSES,this.myCoures.bind(this));
  160 + _myCenterApe.on(MessageTypes.MY_BOOKINGS,this.myBookings.bind(this));
  161 + //个人中心 我的课程
  162 + _myCoursesApe = new MyCoursesApe();
  163 + //个人中心 我的预约
  164 + _myBookingsApe = new MyBookingsApe();
  165 +
  166 + //预约管理
  167 + _subscribeApe = new SubscribeApe();
  168 + _subscribeApe.on(MessageTypes.ORDER_FINISH,this.orderFinish.bind(this));
  169 + //收藏
  170 + _collectApe = new CollectApe();
154 171
155 //互动课堂 172 //互动课堂
156 _lanclassApe = new LanclassApe(); 173 _lanclassApe = new LanclassApe();
@@ -177,27 +194,12 @@ class Main { @@ -177,27 +194,12 @@ class Main {
177 _aboutClassApe = new AboutClassApe(); 194 _aboutClassApe = new AboutClassApe();
178 //列表详情 195 //列表详情
179 _listDetailsApe = new ListDetailsApe(); 196 _listDetailsApe = new ListDetailsApe();
  197 + _listDetailsApe.on(MessageTypes.IS_COLLECT,this.isCollect.bind(this));
180 //管理员 198 //管理员
181 _administratorApe = new AdministratorApe(); 199 _administratorApe = new AdministratorApe();
182 _administratorApe.on(MessageTypes.SWITCH_CLASS,this.switchClass.bind(this)); 200 _administratorApe.on(MessageTypes.SWITCH_CLASS,this.switchClass.bind(this));
183 //录制回放 201 //录制回放
184 _playRecordApe = new PlayRecordApe(); 202 _playRecordApe = new PlayRecordApe();
185 -  
186 - //个人中心  
187 - _myCenterApe = new MyCenterApe();  
188 - _myCenterApe.on(MessageTypes.ROLE_MESSAGE,this.roleMessage.bind(this));  
189 - _myCenterApe.on(MessageTypes.MY_COURSES,this.myCoures.bind(this));  
190 - _myCenterApe.on(MessageTypes.MY_BOOKINGS,this.myBookings.bind(this));  
191 - //个人中心 我的课程  
192 - _myCenterApe = new MyCoursesApe();  
193 - //个人中心 我的预约  
194 - _myBookingsApe = new MyBookingsApe();  
195 -  
196 - //预约管理  
197 - _subscribeApe = new SubscribeApe();  
198 - _subscribeApe.on(MessageTypes.ORDER_FINISH,this.orderFinish.bind(this));  
199 - //收藏  
200 - _collectApe = new CollectApe();  
201 } 203 }
202 204
203 // 205 //
@@ -210,14 +212,23 @@ class Main { @@ -210,14 +212,23 @@ class Main {
210 loginIn(_data){ 212 loginIn(_data){
211 loger.log('进入课堂时显示的type值---登录',_data.userType) 213 loger.log('进入课堂时显示的type值---登录',_data.userType)
212 if(_data && _data.userType){ 214 if(_data && _data.userType){
  215 +
213 if(_data.userType == ClassDataProxy.USER_TYPE_1){ 216 if(_data.userType == ClassDataProxy.USER_TYPE_1){
214 this._teacherHome(); 217 this._teacherHome();
  218 +
215 _teacherDetailApe.detailPage(); 219 _teacherDetailApe.detailPage();
  220 + if(_myCenterApe){
  221 + _myCenterApe.detailpage();
  222 + }else {
  223 + loger.log("_myCenterApe 无效");
  224 + }
  225 +
216 }else if(_data.userType == ClassDataProxy.USER_TYPE_2){ 226 }else if(_data.userType == ClassDataProxy.USER_TYPE_2){
217 this._showAdministratorInfo(); 227 this._showAdministratorInfo();
218 _managementHomePageApe.detailPage(); 228 _managementHomePageApe.detailPage();
219 }else if(_data.userType == ClassDataProxy.USER_TYPE_8){ 229 }else if(_data.userType == ClassDataProxy.USER_TYPE_8){
220 _homeApe.detailPage(); 230 _homeApe.detailPage();
  231 + _myCenterApe.detailpage();
221 }else if(_data.userType == ClassDataProxy.USER_TYPE_32){ 232 }else if(_data.userType == ClassDataProxy.USER_TYPE_32){
222 233
223 }else{ 234 }else{
@@ -225,6 +236,11 @@ class Main { @@ -225,6 +236,11 @@ class Main {
225 } 236 }
226 } 237 }
227 } 238 }
  239 +
  240 + loginMycenter(){
  241 + _myCenterApe.detailpage();
  242 + loger.log('1111111111')
  243 + }
228 homeSkip(_data) { 244 homeSkip(_data) {
229 if (_data && _data.userType) { 245 if (_data && _data.userType) {
230 if (_data.userType == ClassDataProxy.USER_TYPE_1) { 246 if (_data.userType == ClassDataProxy.USER_TYPE_1) {
@@ -238,12 +254,19 @@ class Main { @@ -238,12 +254,19 @@ class Main {
238 } 254 }
239 //我的课程 255 //我的课程
240 myCoures(){ 256 myCoures(){
241 - _myCenterApe.myCoursesMessage(); 257 + _myCoursesApe.myCoursesMessage();
242 } 258 }
243 //我的预约 259 //我的预约
244 myBookings(){ 260 myBookings(){
245 _myBookingsApe.myBookingsMessage(); 261 _myBookingsApe.myBookingsMessage();
246 } 262 }
  263 + //是否收藏
  264 + isCollect(_data){
  265 + if(_data){
  266 + // _collectApe.isCollect(_data.id);
  267 + }
  268 +
  269 + }
247 //管理员左侧列表 270 //管理员左侧列表
248 switchClass(_data){ 271 switchClass(_data){
249 let ind = parseInt(_data); 272 let ind = parseInt(_data);
@@ -283,6 +306,8 @@ class Main { @@ -283,6 +306,8 @@ class Main {
283 case 8: 306 case 8:
284 //个人设置 307 //个人设置
285 break; 308 break;
  309 + default:
  310 + return;
286 } 311 }
287 } 312 }
288 //切换头部列表 313 //切换头部列表
@@ -301,6 +326,8 @@ class Main { @@ -301,6 +326,8 @@ class Main {
301 case 3: 326 case 3:
302 _teacherDetailApe.isLocalStorage(); 327 _teacherDetailApe.isLocalStorage();
303 break; 328 break;
  329 + case 4:
  330 + break;
304 default: 331 default:
305 return; 332 return;
306 } 333 }
@@ -336,6 +336,7 @@ ClassDataProxy.siteId = ''; @@ -336,6 +336,7 @@ ClassDataProxy.siteId = '';
336 ClassDataProxy.userMobile = ''; 336 ClassDataProxy.userMobile = '';
337 ClassDataProxy.userEmail = ''; 337 ClassDataProxy.userEmail = '';
338 ClassDataProxy.monicker = ""; 338 ClassDataProxy.monicker = "";
  339 +ClassDataProxy.meetingId = '';
339 340
340 ClassDataProxy.USER_TYPE_0 = 0; 341 ClassDataProxy.USER_TYPE_0 = 0;
341 ClassDataProxy.USER_TYPE_1 = 1; 342 ClassDataProxy.USER_TYPE_1 = 1;