董佳音 / networkSchool

转到一个项目
Toggle navigation Toggle navigation pinning
董佳音
9060a56a 1 parent f78f8be8

修改首页数据显示，详情页

内嵌 并排对比
正在显示 14 个修改的文件 包含 1046 行增加 和 406 行删除
@@ -378,6 +378,7 @@ body{ @@ -378,6 +378,7 @@ body{
378 .classifyListContent{ 378 .classifyListContent{
379 width: 100%; 379 width: 100%;
380 min-height:600px; 380 min-height:600px;
  381 + margin-bottom:20px;
381 float: left; 382 float: left;
382 } 383 }
383 .classifyList{ 384 .classifyList{
@@ -89,19 +89,118 @@ @@ -89,19 +89,118 @@
89 </div> 89 </div>
90 </div> 90 </div>
91 <!--课堂分类列表--> 91 <!--课堂分类列表-->
92 - <div class="classifyListBox" id="classifyListBox">  
93 - <div class="classifyListTitle" id="classifyListTitle">最新直播课程</div>  
94 - <div class="classifyListContent" id="classifyListContent">  
95 - <!--<div class="classifyList">  
96 - <img class="curriculumListImg" src="" alt="">  
97 - <p class="curriculumListTit">初一英语阅读理解习题课</p>  
98 - <p class="curriculumListInfo">  
99 - <span class="curriculumListTime">今天 09:00-21:30</span>  
100 - <span class="curriculumListNum">3200人已预约</span>  
101 - </p>  
102 - </div>--> 92 + <!--最新直播课程-->
  93 +
  94 + <div class="classifyListBox" id="liveContentAllBox">
  95 + <div class="classifyListTitle">最新直播课程</div>
  96 + <div class="classifyListContent" id="liveContent">
  97 + </div>
  98 + <div class="pageNumContentBox" id="livePageBox">
  99 + <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
  100 + <tbody>
  101 + <tr>
  102 + <td height="60" colspan="11" class="tr_bottom" style="">
  103 + <span class="classHandlerPageMsg" id="livePageNumMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
  104 + <ul class="classHandlerPageInfoBox">
  105 + <li class="classHandlerPageInfo">
  106 + <span class="classHandlerHomePage" id="livePageNumHomePage">首页</span>
  107 + </li>
  108 + <li class="classHandlerPageInfo">
  109 + <span class="classHandlerUpPage" id="livePageNumUpPage">上一页</span>
  110 + </li>
  111 + <li class="classHandlerPageInfo">
  112 + <span class="classHandlerDownPage" id="livePageNumDownPage">下一页</span>
  113 + </li>
  114 + <li class="classHandlerPageInfo">
  115 + <span class="classHandlerEndPage" id="livePageNumEndPage">尾页</span>
  116 + </li>
  117 + <li class="classHandlerPageInfo">
  118 + <input id="livePageInfoInput" class="classHandlerPageInfoInput" type="text">
  119 + </li>
  120 + <li class="classHandlerPageInfo classHandlerPageInfoCheck">
  121 + <span id="liveSpecificPage">GO</span>
  122 + </li>
  123 + </ul>
  124 + </td>
  125 + </tr>
  126 + </tbody>
  127 + </table>
  128 + </div>
  129 + </div>
  130 + <!--最新互动课程-->
  131 + <div class="classifyListBox" id="lanclassAllBox">
  132 + <div class="classifyListTitle">最新互动课程</div>
  133 + <div class="classifyListContent" id="lanclassContent">
  134 +
  135 + </div>
  136 + <div class="pageNumContentBox" id="lanclassPageBox">
  137 + <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
  138 + <tbody>
  139 + <tr>
  140 + <td height="60" colspan="11" class="tr_bottom" style="">
  141 + <span class="classHandlerPageMsg" id="pageNumContentMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
  142 + <ul class="classHandlerPageInfoBox">
  143 + <li class="classHandlerPageInfo">
  144 + <span class="classHandlerHomePage" id="pageNumContentHomePage">首页</span>
  145 + </li>
  146 + <li class="classHandlerPageInfo">
  147 + <span class="classHandlerUpPage" id="pageNumContentUpPage">上一页</span>
  148 + </li>
  149 + <li class="classHandlerPageInfo">
  150 + <span class="classHandlerDownPage" id="pageNumContentDownPage">下一页</span>
  151 + </li>
  152 + <li class="classHandlerPageInfo">
  153 + <span class="classHandlerEndPage" id="pageNumContentEndPage">尾页</span>
  154 + </li>
  155 + <li class="classHandlerPageInfo">
  156 + <input id="pageNumContentPageInfoInput" class="classHandlerPageInfoInput" type="text">
  157 + </li>
  158 + <li class="classHandlerPageInfo classHandlerPageInfoCheck">
  159 + <span id="pageNumContentSpecificPage">GO</span>
  160 + </li>
  161 + </ul>
  162 + </td>
  163 + </tr>
  164 + </tbody>
  165 + </table>
  166 + </div>
  167 + </div>
  168 + <!--推荐老师-->
  169 + <div class="classifyListBox" id="teacherIntroAllBox">
  170 + <div class="classifyListTitle" id="teacherIntroTitle">推荐老师</div>
  171 + <div class="classifyListContent" id="teacherIntroContent">
  172 + </div>
  173 + <div class="pageNumContentBox" id="teacherIntroPageBox">
  174 + <table width="100%" align="center" cellpadding="0" cellspacing="0" border="0">
  175 + <tbody>
  176 + <tr>
  177 + <td height="60" colspan="11" class="tr_bottom" style="">
  178 + <span class="classHandlerPageMsg" id="pageNumContentMsg" style="line-height: 38px; padding-left: 20px; float: left">第1页/共2页，有16个记录</span>
  179 + <ul class="classHandlerPageInfoBox">
  180 + <li class="classHandlerPageInfo">
  181 + <span class="classHandlerHomePage" id="pageNumContentHomePage">首页</span>
  182 + </li>
  183 + <li class="classHandlerPageInfo">
  184 + <span class="classHandlerUpPage" id="pageNumContentUpPage">上一页</span>
  185 + </li>
  186 + <li class="classHandlerPageInfo">
  187 + <span class="classHandlerDownPage" id="pageNumContentDownPage">下一页</span>
  188 + </li>
  189 + <li class="classHandlerPageInfo">
  190 + <span class="classHandlerEndPage" id="pageNumContentEndPage">尾页</span>
  191 + </li>
  192 + <li class="classHandlerPageInfo">
  193 + <input id="pageNumContentPageInfoInput" class="classHandlerPageInfoInput" type="text">
  194 + </li>
  195 + <li class="classHandlerPageInfo classHandlerPageInfoCheck">
  196 + <span id="pageNumContentSpecificPage">GO</span>
  197 + </li>
  198 + </ul>
  199 + </td>
  200 + </tr>
  201 + </tbody>
  202 + </table>
103 </div> 203 </div>
104 - <div class="pageNumContentBox" id="pageNumContentBox"></div>  
105 </div> 204 </div>
106 <!--直播课堂详情--> 205 <!--直播课堂详情-->
107 <div class="lanclassBox" id="lanclassBox"> 206 <div class="lanclassBox" id="lanclassBox">
@@ -127,11 +226,11 @@ @@ -127,11 +226,11 @@
127 <span id="qqIcon" class="thirdPartyIcon qqIcon iconfont">&#xe605;</span> 226 <span id="qqIcon" class="thirdPartyIcon qqIcon iconfont">&#xe605;</span>
128 <span id="weiboIcon" class="thirdPartyIcon weiboIcon iconfont">&#xe6eb;</span> 227 <span id="weiboIcon" class="thirdPartyIcon weiboIcon iconfont">&#xe6eb;</span>
129 </div> 228 </div>
130 - <div class="collectBox" id="collectYes" data="0"> 229 + <div class="collectBox" id="collectYes" data="6">
131 <img class="collectIcon" id="collectYesIcon" src="images/collect.png" alt=""> 230 <img class="collectIcon" id="collectYesIcon" src="images/collect.png" alt="">
132 <span class="collectText">已收藏</span> 231 <span class="collectText">已收藏</span>
133 </div> 232 </div>
134 - <div class="collectBox" id="collectNo" data="0"> 233 + <div class="collectBox" id="collectNo" data="7">
135 <img class="collectIcon" id="collectNoIcon" src="images/not-collect.png" alt=""> 234 <img class="collectIcon" id="collectNoIcon" src="images/not-collect.png" alt="">
136 <span class="collectText">未收藏</span> 235 <span class="collectText">未收藏</span>
137 </div> 236 </div>
@@ -142,10 +241,7 @@ @@ -142,10 +241,7 @@
142 课程介绍 241 课程介绍
143 </p> 242 </p>
144 <p class="lanclassIntroduceContent" id="lanclassIntroduceDescription"> 243 <p class="lanclassIntroduceContent" id="lanclassIntroduceDescription">
145 - 课程介绍Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet.  
146 - Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar  
147 - tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.  
148 - Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget. 244 + 中学生英语听力水平的提高，除了在课堂上掌握教材和大纲所要求的听力知识外，还必须进行大量的听力训练，才能达到消化所学知识、熟能生巧的地步。目前市场上的同步听力训练辅导材料，大都是针对某一特定的教材，按教材和教学要求进行编写，这固然可以帮助学生消化和掌握课堂所学内容，由于单元教学目标要求的限制，无法进行系统的、有针对性的听力训练。本套听力丛书就是针对目前中学英语听力教学中的这一特殊情况，根据中学生的实际情况而编写的。
149 </p> 245 </p>
150 </div> 246 </div>
151 <div class="lanclassContent teacherInfos" id="teacherInfos"> 247 <div class="lanclassContent teacherInfos" id="teacherInfos">
@@ -153,25 +249,22 @@ @@ -153,25 +249,22 @@
153 老师简介 249 老师简介
154 </div> 250 </div>
155 <div class="teacherInfoData"> 251 <div class="teacherInfoData">
156 - <span class="teacherInfoName">张媛媛</span> 252 + <span class="teacherInfoName" id="teacherInfoName">张媛媛</span>
157 <span class="teacherInfoSchool" id="teacherInfoSchool">北京外国语学院</span> 253 <span class="teacherInfoSchool" id="teacherInfoSchool">北京外国语学院</span>
158 </div> 254 </div>
159 <div class="lanclassIntroduceContent" id="teacherInfoContent"> 255 <div class="lanclassIntroduceContent" id="teacherInfoContent">
160 - 课程介绍Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet.  
161 - Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar  
162 - tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.  
163 - Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus 256 + 1982年1月毕业于北京师范学院(现北京师范大学)外语系英语专业。在二十多年的教学工作中，曾讲授初中、高中、师范英语班、大专英语班及教师继续教育的英语课程。获得广泛好评。在全国范围内正式出版书籍近三十本；制作出版英语口语教学VCD6盘。北京市英语教师继续教育学科指导小组成员。1998年被评为北京市英语骨干教师．2000年参加国家级英语骨干教师培训，2003年被评为北京市英语学科带头人，2005年被评为北京市特级教师。
164 </div> 257 </div>
165 </div> 258 </div>
166 </div> 259 </div>
167 - <!--互动课堂详情页--> 260 + <!--老师详情页-->
168 <div class="teacherDetailBox" id="teacherDetailBox"> 261 <div class="teacherDetailBox" id="teacherDetailBox">
169 <div class="teacherDetailInfo"> 262 <div class="teacherDetailInfo">
170 <div class="teacherDetailInfoLeft"> 263 <div class="teacherDetailInfoLeft">
171 <img class="teacherDetailInfoImg" id="teacherDetailInfoImg" src="" alt=""> 264 <img class="teacherDetailInfoImg" id="teacherDetailInfoImg" src="" alt="">
172 <ul class="teacherDetailInfoDetailBox"> 265 <ul class="teacherDetailInfoDetailBox">
173 <li class="teacherDetailInfoDetailTit"> 266 <li class="teacherDetailInfoDetailTit">
174 - <span class="teacherDetailInfoDetailName" id="teacherDetailInfoDetailName">张3333</span> 267 + <span class="teacherDetailInfoDetailName" id="teacherDetailInfoDetailName">张媛媛</span>
175 <span class="teacherDetailInfoDetailSex" id="teacherDetailInfoDetailSex">女</span> 268 <span class="teacherDetailInfoDetailSex" id="teacherDetailInfoDetailSex">女</span>
176 </li> 269 </li>
177 <li class="teacherDetailInfoDetailSpeciality"> 270 <li class="teacherDetailInfoDetailSpeciality">
@@ -201,7 +294,7 @@ @@ -201,7 +294,7 @@
201 授课内容： 294 授课内容：
202 </p> 295 </p>
203 <p class="teacherDetailReferralContent" id="teacherDetailReferralContent"> 296 <p class="teacherDetailReferralContent" id="teacherDetailReferralContent">
204 - 授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容 297 + 中学生英语听力水平的提高，除了在课堂上掌握教材和大纲所要求的听力知识外，还必须进行大量的听力训练，才能达到消化所学知识、熟能生巧的地步。目前市场上的同步听力训练辅导材料，大都是针对某一特定的教材，按教材和教学要求进行编写，这固然可以帮助学生消化和掌握课堂所学内容，由于单元教学目标要求的限制，无法进行系统的、有针对性的听力训练。本套听力丛书就是针对目前中学英语听力教学中的这一特殊情况，根据中学生的实际情况而编写的。
205 </p> 298 </p>
206 </div> 299 </div>
207 <button class="teacherDetailOrderBtn btnHover" id="orderBtn" data="1" value='1'>我要预约</button> 300 <button class="teacherDetailOrderBtn btnHover" id="orderBtn" data="1" value='1'>我要预约</button>
@@ -214,31 +307,31 @@ @@ -214,31 +307,31 @@
214 </li> 307 </li>
215 <li class="teacherDetailBasics"> 308 <li class="teacherDetailBasics">
216 <label class="teacherDetailBasicsTitle">教师职称： </label> 309 <label class="teacherDetailBasicsTitle">教师职称： </label>
217 - <span class="teacherDetailPost" id="teacherDetailPost">111</span> 310 + <span class="teacherDetailPost" id="teacherDetailPost">特技教师</span>
218 </li> 311 </li>
219 <li class="teacherDetailBasics"> 312 <li class="teacherDetailBasics">
220 <label class="teacherDetailBasicsTitle">最高学历： </label> 313 <label class="teacherDetailBasicsTitle">最高学历： </label>
221 - <span id="teacherDetailEducation">111</span> 314 + <span id="teacherDetailEducation">硕士</span>
222 </li> 315 </li>
223 <li class="teacherDetailBasics"> 316 <li class="teacherDetailBasics">
224 <label class="teacherDetailBasicsTitle">毕业院校： </label> 317 <label class="teacherDetailBasicsTitle">毕业院校： </label>
225 - <span id="teacherDetailAcademy">111</span> 318 + <span id="teacherDetailAcademy">北京外国语大学</span>
226 </li> 319 </li>
227 <li class="teacherDetailBasics"> 320 <li class="teacherDetailBasics">
228 <label class="teacherDetailBasicsTitle">授课方式： </label> 321 <label class="teacherDetailBasicsTitle">授课方式： </label>
229 - <span id="teacherDetailWay">111</span> 322 + <span id="teacherDetailWay">线上/线下均可</span>
230 </li> 323 </li>
231 <li class="teacherDetailBasics"> 324 <li class="teacherDetailBasics">
232 <label class="teacherDetailBasicsTitle">授课地区： </label> 325 <label class="teacherDetailBasicsTitle">授课地区： </label>
233 - <span id="teacherDetailArea">111</span> 326 + <span id="teacherDetailArea">不限</span>
234 </li> 327 </li>
235 <li class="teacherDetailBasics"> 328 <li class="teacherDetailBasics">
236 <label class="teacherDetailBasicsTitle">基本简介： </label> 329 <label class="teacherDetailBasicsTitle">基本简介： </label>
237 - <span id="teacherDetailSynopsis">111</span> 330 + <span id="teacherDetailSynopsis">【1】专业8级，英语会考不算强，能说说好才算强</span>
238 </li> 331 </li>
239 <li class="teacherDetailBasics"> 332 <li class="teacherDetailBasics">
240 <label class="teacherDetailBasicsTitle">教学特点： </label> 333 <label class="teacherDetailBasicsTitle">教学特点： </label>
241 - <span id="teacherDetailTrait">111</span> 334 + <span id="teacherDetailTrait">温文尔雅</span>
242 </li> 335 </li>
243 </ul> 336 </ul>
244 <div class="teacherDetailCurriculum"> 337 <div class="teacherDetailCurriculum">
@@ -1383,8 +1476,8 @@ @@ -1383,8 +1476,8 @@
1383 <div class="studentMyCerter" id="studentMyCerter"> 1476 <div class="studentMyCerter" id="studentMyCerter">
1384 <div class="myCenterContentTitleBox"> 1477 <div class="myCenterContentTitleBox">
1385 <ul class="liveInfoLeft" id="studentInfoList"> 1478 <ul class="liveInfoLeft" id="studentInfoList">
1386 - <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="1">待学习</li>  
1387 - <li class="liveInfoLeftLi" data="0">已学完</li> 1479 + <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="0">待学习</li>
  1480 + <li class="liveInfoLeftLi" data="1">已学完</li>
1388 <li class="liveInfoLeftLi" data="2">收藏</li> 1481 <li class="liveInfoLeftLi" data="2">收藏</li>
1389 </ul> 1482 </ul>
1390 </div> 1483 </div>
@@ -1406,11 +1499,11 @@ @@ -1406,11 +1499,11 @@
1406 <!--我的课程--> 1499 <!--我的课程-->
1407 <div class="myCenterContentBox"> 1500 <div class="myCenterContentBox">
1408 <div class="myCenterContentTitleBox studyContent"> 1501 <div class="myCenterContentTitleBox studyContent">
1409 - <div class="liveInfoLeft" id="courseInfoList">  
1410 - <div class="liveInfoLeftLi liveInfoLeftLiCheck">待学习</div>  
1411 - <div class="liveInfoLeftLi">已学完</div>  
1412 - <div class="liveInfoLeftLi">收藏</div>  
1413 - </div> 1502 + <ul class="liveInfoLeft" id="courseInfoList">
  1503 + <li class="liveInfoLeftLi liveInfoLeftLiCheck" data="0">待学习</li>
  1504 + <li class="liveInfoLeftLi" data="1">已学完</li>
  1505 + <li class="liveInfoLeftLi" data="2">收藏</li>
  1506 + </ul>
1414 </div> 1507 </div>
1415 <div class="courseMinuteList" id="courseMinuteList"> 1508 <div class="courseMinuteList" id="courseMinuteList">
1416 <div class="courseMinuteListTimeTit"> 1509 <div class="courseMinuteListTimeTit">
@@ -13,6 +13,8 @@ MessageTypes.LOGIN_IN= "login_in"; //更新用户退出 @@ -13,6 +13,8 @@ MessageTypes.LOGIN_IN= "login_in"; //更新用户退出
13 //header按钮 13 //header按钮
14 MessageTypes.HOME_SKIP= "home_skip"; //首页跳转 14 MessageTypes.HOME_SKIP= "home_skip"; //首页跳转
15 15
  16 +MessageTypes.SWITCH_HEADER= "switch_header"; //head 头部 切换
  17 +
16 18
17 19
18 //管理员列表 20 //管理员列表
@@ -20,5 +22,9 @@ MessageTypes.SWITCH_CLASS= "switch_class"; //创建课堂 @@ -20,5 +22,9 @@ MessageTypes.SWITCH_CLASS= "switch_class"; //创建课堂
20 22
21 //创建课堂成功 23 //创建课堂成功
22 MessageTypes.ADD_CLASS= "add_class"; //创建课堂 24 MessageTypes.ADD_CLASS= "add_class"; //创建课堂
  25 +
  26 +
  27 +//预约成功
  28 +MessageTypes.ORDER_FINISH= "order_finish"; //预约成功
23 export default MessageTypes; 29 export default MessageTypes;
24 30
  1 +//*
  2 +// 收藏模块
  3 +// */
  4 +
  5 +import Loger from "../Loger";
  6 +import Ape from "./Ape";
  7 +import $ from "jquery";
  8 +import ClassDataProxy from "proxy/ClassDataProxy";
  9 +import MessageTypes from "../MessageTypes";
  10 +import ErrorApe from "./ErrorApe";
  11 +
  12 +let loger = Loger.getLoger('PC-CollectApe');
  13 +class CollectApe extends Ape {
  14 + constructor() {
  15 + super();
  16 + this.addEvent();
  17 + this.init();
  18 + }
  19 +
  20 + init() {
  21 + $('#collectYes').on('click',this._collectYesHandler.bind(this));//取消收藏
  22 + $('#collectNo').on('click',this._collectNoHandler.bind(this));//收藏
  23 + }
  24 +
  25 + addEvent() {
  26 +
  27 + }
  28 + _collectNoHandler(evt){
  29 + let that = this;
  30 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
  31 + let status = $(evt.currentTarget).attr('data');
  32 + let id = $('#lanclassBox').attr('data');
  33 + loger.log('收藏数据信息',status)
  34 + let data = {siteId:ClassDataProxy.siteId,
  35 + "studentId":ClassDataProxy.id,
  36 + "status":parseInt(status),
  37 + "meetingId":id
  38 + }
  39 + this.detailPage(_url,data,function(_data){
  40 + if(_data && _data.code == 200){
  41 + that._collectNoClick();
  42 + ErrorApe.showWarnError('收藏成功');
  43 + loger.log('收藏数据信息',_data)
  44 + }
  45 +
  46 + })
  47 + }
  48 + _collectYesHandler(evt){
  49 + let that = this;
  50 +
  51 + let status = $(evt.currentTarget).attr('data');
  52 + let id = $('#lanclassBox').attr('data');
  53 + 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)
  62 + }
  63 +
  64 + })
  65 + }
  66 + detailPage(url,data,callback){
  67 + $.ajax({
  68 + type: "POST",
  69 + url: url,
  70 + timeout:5000,
  71 + data : data,
  72 + headers: {siteId:ClassDataProxy.siteId,
  73 + 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
  74 + success:function(_data){
  75 + //获取我的课程数据
  76 + if(_data && _data.code == 200){
  77 + if(callback){
  78 + callback(_data);
  79 + }
  80 + }else{
  81 + if(callback){
  82 + callback(null);
  83 + }
  84 + }
  85 + },
  86 + error:function(error){
  87 + if(callback){
  88 + callback(null);
  89 + }
  90 + loger.log(error,'收藏数据获取失败')
  91 + }
  92 + })
  93 + }
  94 + toLogin(){
  95 + $('#userLoginBox').show();
  96 + }
  97 + _collectYesClick(){
  98 + $('#collectYes ').hide();
  99 + $('#collectNo ').show();
  100 + }
  101 + _collectNoClick(){
  102 + $('#collectYes ').show();
  103 + $('#collectNo ').hide();
  104 + }
  105 + //工具类
  106 + _format(str, obj) {
  107 + return str.replace(/\{(\w+)\}/g, function (match, group, index) {
  108 + return obj[group];
  109 + });
  110 + };
  111 +}
  112 +export default CollectApe;
@@ -256,7 +256,7 @@ class CreateClassApe extends Ape { @@ -256,7 +256,7 @@ class CreateClassApe extends Ape {
256 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting'; 256 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting';
257 //let userName = window.localStorage.getItem('loginName'); 257 //let userName = window.localStorage.getItem('loginName');
258 let userType = window.localStorage.getItem('userType'); 258 let userType = window.localStorage.getItem('userType');
259 - dateList.siteId = 'networkschool'; 259 + dateList.siteId = ClassDataProxy.siteId;
260 dateList.userId = '123'; 260 dateList.userId = '123';
261 // dateList.userName = userName; 261 // dateList.userName = userName;
262 dateList.userType = userType; 262 dateList.userType = userType;
@@ -7,7 +7,7 @@ import Ape from "./Ape"; @@ -7,7 +7,7 @@ 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 import MessageTypes from "../MessageTypes";
10 -const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> 10 +const classifyList = `<div class="classifyList {_classifyListR}" data="{_id}">
11 <img class="curriculumListImg" src="{_msgImg}" alt=""> 11 <img class="curriculumListImg" src="{_msgImg}" alt="">
12 <p class="curriculumListTit">{_classroomTitle}</p> 12 <p class="curriculumListTit">{_classroomTitle}</p>
13 <p class="curriculumListInfo"> 13 <p class="curriculumListInfo">
@@ -16,7 +16,7 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> @@ -16,7 +16,7 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}">
16 </p> 16 </p>
17 </div>`; 17 </div>`;
18 18
19 -const teacherList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}"> 19 +const teacherList = `<div class="classifyList {_classifyListR}" data="{_id}">
20 <img class="curriculumListImg" src="{_msgImg}" alt=""> 20 <img class="curriculumListImg" src="{_msgImg}" alt="">
21 <p class="curriculumListTit">{_classroomTitle}</p> 21 <p class="curriculumListTit">{_classroomTitle}</p>
22 <p class="curriculumListInfo"> 22 <p class="curriculumListInfo">
@@ -37,8 +37,12 @@ class HomeApe extends Ape { @@ -37,8 +37,12 @@ class HomeApe extends Ape {
37 } 37 }
38 38
39 init() { 39 init() {
40 - $('#defaultBtn').on('click',this._lanclassBtnHandler.bind(this));  
41 40
  41 + $('#header_list li').on('click',this.switchHeaderHandler.bind(this));
  42 +
  43 + $('#liveBtnMove').on('click',this.liveBtnMoveHandler.bind(this));
  44 + $('#lanclassBtnMove').on('click',this.lanclassBtnMoveHandler.bind(this));
  45 + $('#teacherBtnMove').on('click',this.teacherBtnMoveHandler.bind(this));
42 } 46 }
43 47
44 addEvent() { 48 addEvent() {
@@ -46,7 +50,27 @@ class HomeApe extends Ape { @@ -46,7 +50,27 @@ class HomeApe extends Ape {
46 } 50 }
47 isLocalStorage(){ 51 isLocalStorage(){
48 $('#myCenterBox').hide(); 52 $('#myCenterBox').hide();
49 - this.detailPage(); 53 + this.homeAllDate();
  54 + }
  55 + switchHeaderHandler(evt){
  56 + $(evt.currentTarget).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
  57 + let ind = $(evt.target).index();
  58 + this._emit(MessageTypes.SWITCH_HEADER,ind);
  59 + }
  60 + liveBtnMoveHandler(){
  61 + this.switchClass(1);
  62 + this._emit(MessageTypes.SWITCH_HEADER,1);
  63 + }
  64 + lanclassBtnMoveHandler(){
  65 + this.switchClass(2);
  66 + this._emit(MessageTypes.SWITCH_HEADER,2);
  67 + }
  68 + teacherBtnMoveHandler(){
  69 + this.switchClass(3);
  70 + this._emit(MessageTypes.SWITCH_HEADER,3);
  71 + }
  72 + switchClass(ind){
  73 + $('#header_list li').eq(ind).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
50 } 74 }
51 _judgeListPlace(){ 75 _judgeListPlace(){
52 let i; 76 let i;
@@ -57,31 +81,78 @@ class HomeApe extends Ape { @@ -57,31 +81,78 @@ class HomeApe extends Ape {
57 } 81 }
58 } 82 }
59 } 83 }
60 - _lanclassBtnHandler(evt){  
61 - loger.log('首页',ClassDataProxy.userType)  
62 - $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');  
63 - this.studentClick(); 84 + homeAllDate(){
  85 + //直播信息
  86 + this.liveModule();
  87 + //互动信息
  88 + this.interactModule();
  89 + //老师信息
  90 + this.teacherModule();
64 } 91 }
65 - detailPage(){ 92 + //直播信息
  93 + liveModule(){
  94 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
  95 + let data = {siteId:ClassDataProxy.siteId,meetingStatus:2}
66 let that = this; 96 let that = this;
  97 + this.detailPage(_url,data,8,1,function(_data){
  98 + if(_data){
  99 + //loger.log('首页直播信息',_data)
  100 + that._liveClassData(_data.returnData.data.meetingInfo);
  101 + }
  102 + })
  103 + }
  104 + //互动信息
  105 + interactModule(){
67 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; 106 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
  107 + let data = {siteId:ClassDataProxy.siteId,meetingStatus:1}
  108 + let that = this;
  109 + this.detailPage(_url,data,8,1,function(_data){
  110 + if(_data){
  111 + // loger.log('首页互动信息',_data)
  112 + that._gainClassData(_data.returnData.data.meetingInfo);
  113 + }
  114 + })
  115 + }
  116 + //老师信息
  117 + teacherModule(){
  118 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUserByUserType';
  119 + let data = {siteId:ClassDataProxy.siteId,userType : 1}
  120 + let that = this;
  121 + this.detailPage(_url,data,8,1,function(_data){
  122 + if(_data){
  123 + // loger.log('首页老师信息',_data)
  124 + that._teacherDate(_data.returnData.data.users);
  125 + }
  126 + })
  127 + }
  128 + detailPage(url,data,num,ind,callback){
  129 + let that = this;
68 $.ajax({ 130 $.ajax({
69 type: "POST", 131 type: "POST",
70 - url: _url,  
71 - data:{siteId:ClassDataProxy.siteId},  
72 - headers: {siteId:ClassDataProxy.siteId, 132 + url: url,
  133 + timeout:5000,
  134 + data : data,
  135 + headers: {siteId:ClassDataProxy.siteId,pageno:num, page:ind,
73 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, 136 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
74 success:function(_data){ 137 success:function(_data){
75 - // loger.log(_data,'成功')  
76 - //获取课堂数据 138 +
  139 + //获取我的课程数据
77 if(_data && _data.code == 200){ 140 if(_data && _data.code == 200){
78 - that._gainClassData(_data.returnData.data); 141 + if(callback){
  142 + callback(_data);
  143 + }
  144 + }else{
  145 + if(callback){
  146 + callback(null);
  147 + }
79 } 148 }
80 }, 149 },
81 error:function(error){ 150 error:function(error){
82 - //alert('首页数据获取失败')  
83 - that._gainClassDataErr();  
84 - console.log(error,'首页数据获取失败') 151 + //alert('直播数据获取失败')
  152 + if(callback){
  153 + callback(null);
  154 + }
  155 + loger.log(error,'直播数据获取失败')
85 } 156 }
86 }) 157 })
87 } 158 }
@@ -94,51 +165,68 @@ class HomeApe extends Ape { @@ -94,51 +165,68 @@ class HomeApe extends Ape {
94 $('#lanclassBox').hide(); 165 $('#lanclassBox').hide();
95 $('#myCenterBox').hide(); 166 $('#myCenterBox').hide();
96 } 167 }
97 - _gainClassData(_data){ 168 + _liveClassData(_data){
98 let liveList = $('#liveList'); 169 let liveList = $('#liveList');
99 - let lanclassList = $('#lanclassList');  
100 - let teacherIntro = $('#teacherIntro');  
101 liveList.empty(); 170 liveList.empty();
102 - lanclassList.empty();  
103 - teacherIntro.empty();  
104 if(_data){ 171 if(_data){
105 - let _dataList = _data.meetingInfo;  
106 - //直播互动  
107 - for(let i = 0;i<_dataList.length;i++){ 172 + for(let i = 0;i<_data.length;i++){
108 if(i<8){ 173 if(i<8){
109 let j = (i%4)==3; 174 let j = (i%4)==3;
110 - let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) 175 + let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime)
111 let _classifyList = this._format(classifyList,{ 176 let _classifyList = this._format(classifyList,{
112 _classifyListR : j?'classifyListR':'', 177 _classifyListR : j?'classifyListR':'',
113 - _id : _dataList[i].id, 178 + _id : _data[i].id,
114 _msgImg :'../images/u373.png', 179 _msgImg :'../images/u373.png',
115 - _classroomTitle : _dataList[i].meetingName, 180 + _classroomTitle : _data[i].meetingName,
116 _schoolTime : _getTime, 181 _schoolTime : _getTime,
117 - _subscribeNum : _dataList[i].reservationNumber+'人预约' 182 + _subscribeNum : _data[i].reservationNumber+'人预约'
118 }) 183 })
119 liveList.append(_classifyList); 184 liveList.append(_classifyList);
120 - lanclassList.append(_classifyList);  
121 } 185 }
122 } 186 }
123 - //老师  
124 - for(let i = 0;i<_dataList.length;i++){ 187 + }
  188 + }
  189 + _gainClassData(_data){
  190 + let lanclassList = $('#lanclassList');
  191 + lanclassList.empty();
  192 + if(_data){
  193 + for(let i = 0;i<_data.length;i++){
125 if(i<8){ 194 if(i<8){
126 let j = (i%4)==3; 195 let j = (i%4)==3;
127 - let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime)  
128 - let _classifyList = this._format(teacherList,{ 196 + let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime)
  197 + let _classifyList = this._format(classifyList,{
129 _classifyListR : j?'classifyListR':'', 198 _classifyListR : j?'classifyListR':'',
130 - _id : _dataList[i].id, 199 + _id : _data[i].id,
131 _msgImg :'../images/u373.png', 200 _msgImg :'../images/u373.png',
132 - _classroomTitle : _dataList[i].create_user, 201 + _classroomTitle : _data[i].meetingName,
133 _schoolTime : _getTime, 202 _schoolTime : _getTime,
134 - _subscribeNum : _dataList[i].reservationNumber+'人预约' 203 + _subscribeNum : _data[i].reservationNumber+'人预约'
135 }) 204 })
136 - teacherIntro.append(_classifyList); 205 + lanclassList.append(_classifyList);
137 } 206 }
138 } 207 }
139 } 208 }
140 209
141 } 210 }
  211 + _teacherDate(_data){
  212 + let teacherIntro = $('#teacherIntro');
  213 + teacherIntro.empty();
  214 + if(_data){
  215 + for(let i = 0;i<_data.length;i++){
  216 + let j = (i%4)==3;
  217 + let _getTime = ClassDataProxy.getTimeDifference(_data[i].create_time,_data[i].end_time)
  218 + let _classifyList = this._format(teacherList,{
  219 + _classifyListR : j?'classifyListR':'',
  220 + _id : _data[i].id,
  221 + _msgImg :'../images/u373.png',
  222 + _classroomTitle : _data[i].user_name,
  223 + _schoolTime : _getTime.split('-')[0],
  224 + _subscribeNum : _data[i].reservationNumber+'人预约'
  225 + })
  226 + teacherIntro.append(_classifyList);
  227 + }
  228 + }
  229 + }
142 _gainClassDataErr(){ 230 _gainClassDataErr(){
143 let liveList = $('#liveList'); 231 let liveList = $('#liveList');
144 let lanclassList = $('#lanclassList'); 232 let lanclassList = $('#lanclassList');
@@ -8,7 +8,7 @@ import $ from "jquery"; @@ -8,7 +8,7 @@ import $ from "jquery";
8 import ClassDataProxy from "proxy/ClassDataProxy"; 8 import ClassDataProxy from "proxy/ClassDataProxy";
9 let loger = Loger.getLoger('PC-LanclassApe'); 9 let loger = Loger.getLoger('PC-LanclassApe');
10 10
11 -const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> 11 +const classifyList = `<div class="classifyList {_classifyListR}" data="{_id}">
12 <img class="curriculumListImg" src="{_msgImg}" alt=""> 12 <img class="curriculumListImg" src="{_msgImg}" alt="">
13 <p class="curriculumListTit">{_classroomTitle}</p> 13 <p class="curriculumListTit">{_classroomTitle}</p>
14 <p class="curriculumListInfo"> 14 <p class="curriculumListInfo">
@@ -20,7 +20,6 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> @@ -20,7 +20,6 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}">
20 class LanclassApe extends Ape { 20 class LanclassApe extends Ape {
21 constructor() { 21 constructor() {
22 super(); 22 super();
23 - this.classDateList = {};//课堂的所有数据  
24 this.addEvent(); 23 this.addEvent();
25 this.init(); 24 this.init();
26 } 25 }
@@ -30,10 +29,7 @@ class LanclassApe extends Ape { @@ -30,10 +29,7 @@ class LanclassApe extends Ape {
30 this._judgeListPlace(); 29 this._judgeListPlace();
31 $('#collectYes').hide(); 30 $('#collectYes').hide();
32 31
33 - $('#lanclassBtn').on('click',this._lanclassBtnHandler.bind(this));//互动课堂  
34 - $('#lanclassBtnMove').on('click',this._lanclassBtnHandler.bind(this));//互动课堂  
35 -  
36 - $('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页 32 + $('#lanclassPageBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页
37 } 33 }
38 34
39 addEvent() { 35 addEvent() {
@@ -41,21 +37,16 @@ class LanclassApe extends Ape { @@ -41,21 +37,16 @@ class LanclassApe extends Ape {
41 } 37 }
42 _judgeListPlace(){ 38 _judgeListPlace(){
43 let i=(i%4); 39 let i=(i%4);
44 - $('#classifyListContent').find('.classifyList').eq(i==3).addClass('classifyListR'); 40 + $('#lanclassContent').find('.classifyList').eq(i==3).addClass('classifyListR');
45 } 41 }
46 - _lanclassBtnHandler(evt){  
47 - this._clearListContent();  
48 - this._showLoadingImg();  
49 - loger.log('直播',ClassDataProxy.userType)  
50 - let _ele = $(evt.target);  
51 - if(_ele.attr('data')){  
52 - $('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');  
53 - }  
54 - $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); 42 + isLocalStorage(){
55 $('#slideshow').hide(); 43 $('#slideshow').hide();
  44 +
56 $('#defaultBox').hide(); 45 $('#defaultBox').hide();
57 - $('.curriculumBox').hide();  
58 - $('#classifyListBox').show(); 46 + $('#liveContentAllBox').hide();
  47 + $('#lanclassAllBox').show();
  48 + $('#teacherIntroAllBox').hide();
  49 +
59 $('#teacherDetailBox').hide(); 50 $('#teacherDetailBox').hide();
60 $('#lanclassBox').hide(); 51 $('#lanclassBox').hide();
61 $('#myCenterBox').hide(); 52 $('#myCenterBox').hide();
@@ -76,15 +67,13 @@ class LanclassApe extends Ape { @@ -76,15 +67,13 @@ class LanclassApe extends Ape {
76 siteId:ClassDataProxy.siteId, 67 siteId:ClassDataProxy.siteId,
77 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo', 68 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo',
78 }, 69 },
79 - 70 + data:{siteId:ClassDataProxy.siteId},
80 success:function(_data){ 71 success:function(_data){
81 - if(_data != 200 ){  
82 - // loger.warn(_data.data.msg) 72 + if(_data && _data.code == 200){
  73 + //切换列表内容
  74 + that._classDateContent(_data.returnData.data);
  75 + loger.log(_data,'成功')
83 } 76 }
84 - that.classDateList = _data.returnData.data;  
85 - //切换列表内容  
86 - that._classDateContent(that.classDateList);  
87 - loger.log(_data,'成功')  
88 }, 77 },
89 error:function(error){ 78 error:function(error){
90 console.log(error,'失败') 79 console.log(error,'失败')
@@ -101,54 +90,46 @@ class LanclassApe extends Ape { @@ -101,54 +90,46 @@ class LanclassApe extends Ape {
101 type: "POST", 90 type: "POST",
102 url: _url, 91 url: _url,
103 timeout:5000, 92 timeout:5000,
104 - data:{siteId:ClassDataProxy.siteId}, 93 + data:{siteId:ClassDataProxy.siteId,meetingStatus:1},
105 headers: {siteId:ClassDataProxy.siteId, 94 headers: {siteId:ClassDataProxy.siteId,
106 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, 95 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
107 success:function(_data){ 96 success:function(_data){
108 - // loger.log(_data,'成功')  
109 //获取课堂数据 97 //获取课堂数据
110 - that._gainClassData(_data); 98 + if(_data && _data.code == 200){
  99 + that._gainClassData(_data.returnData.data);
  100 + }
111 }, 101 },
112 error:function(error){ 102 error:function(error){
113 - //alert('互动界面获取数据失败')  
114 that._gainClassDataErr(); 103 that._gainClassDataErr();
115 console.log(error,'互动界面获取数据失败') 104 console.log(error,'互动界面获取数据失败')
116 } 105 }
117 }) 106 })
118 } 107 }
119 _gainClassData(_data){ 108 _gainClassData(_data){
120 - if(_data && _data.code == 200){  
121 - this.classDateList = _data.returnData.data;  
122 - let classifyListContent = $('#classifyListContent');  
123 - classifyListContent.empty();  
124 - //切换列表分类的标题  
125 - this._classDateTitle(); 109 + if(_data){
  110 + let lanclassContent = $('#lanclassContent');
  111 + lanclassContent.empty();
126 //切换列表内容 112 //切换列表内容
127 - this._classDateContent(this.classDateList); 113 + this._classDateContent(_data);
128 //页码 114 //页码
129 - this._classDatepageNum(this.classDateList); 115 + this._classDatepageNum(_data);
130 } 116 }
131 } 117 }
132 - _classDateTitle(){  
133 - $('#classifyListTitle').html($('.header_listMsgCheck').attr('data'));  
134 - }  
135 //清楚列表数据 118 //清楚列表数据
136 _clearListContent(){ 119 _clearListContent(){
137 - let classifyListContent = $('#classifyListContent');  
138 - classifyListContent.empty();  
139 - let classifyListTitle = $('#classifyListTitle');  
140 - classifyListTitle.empty();  
141 - let pageNumContentBox = $('#pageNumContentBox');  
142 - pageNumContentBox.empty(); 120 + let lanclassContent = $('#lanclassContent');
  121 + lanclassContent.empty();
  122 + let lanclassPageBox = $('#lanclassPageBox');
  123 + lanclassPageBox.empty();
143 } 124 }
144 //列表显示loading 125 //列表显示loading
145 _showLoadingImg(){ 126 _showLoadingImg(){
146 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`; 127 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`;
147 - $('#classifyListContent').append(loadingImg); 128 + $('#lanclassContent').append(loadingImg);
148 } 129 }
149 _classDateContent(_data){ 130 _classDateContent(_data){
150 - let classifyListContent = $('#classifyListContent');  
151 - classifyListContent.empty(); 131 + let lanclassContent = $('#lanclassContent');
  132 + lanclassContent.empty();
152 let _dataList = _data.meetingInfo; 133 let _dataList = _data.meetingInfo;
153 if(_dataList){ 134 if(_dataList){
154 for(let i = 0;i<_dataList.length;i++){ 135 for(let i = 0;i<_dataList.length;i++){
@@ -162,7 +143,7 @@ class LanclassApe extends Ape { @@ -162,7 +143,7 @@ class LanclassApe extends Ape {
162 _schoolTime : _getTime, 143 _schoolTime : _getTime,
163 _subscribeNum : _dataList[i].reservationNumber+'人预约' 144 _subscribeNum : _dataList[i].reservationNumber+'人预约'
164 }) 145 })
165 - classifyListContent.append(_classifyList); 146 + lanclassContent.append(_classifyList);
166 } 147 }
167 } 148 }
168 } 149 }
@@ -173,33 +154,35 @@ class LanclassApe extends Ape { @@ -173,33 +154,35 @@ class LanclassApe extends Ape {
173 this.pagingConstruct(1,_pageNum); 154 this.pagingConstruct(1,_pageNum);
174 } 155 }
175 pagingConstruct(paging,total){ 156 pagingConstruct(paging,total){
176 - let pageNumContentBox = $('#pageNumContentBox');  
177 - pageNumContentBox.empty(); 157 + let lanclassPageBox = $('#lanclassPageBox');
  158 + lanclassPageBox.empty();
178 let pagingDivInnerHTML = '<div class="pageNumContent">'; 159 let pagingDivInnerHTML = '<div class="pageNumContent">';
179 let isHiddenExist = 0; 160 let isHiddenExist = 0;
180 - for(let i =1 ;i<=total;i++){  
181 - if(i == paging){  
182 - pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';  
183 - }else{  
184 - if (i < 4 || i < (paging + 4) && i > (paging - 2) && i < (total / 2 + 2) || i > (total - 2)) {  
185 - pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';  
186 - isHiddenExist = 0; 161 + if(total > 1){
  162 + for(let i =1 ;i<=total;i++){
  163 + if(i == paging){
  164 + pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';
187 }else{ 165 }else{
188 - if(isHiddenExist == 0){  
189 - pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';  
190 - isHiddenExist = 1; 166 + if (i < 4 || i < (paging + 3) && i > (paging - 2) || i > (total / 2 - 2) && i < (total / 2 + 2) || i > (total - 3)) {
  167 + pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';
  168 + isHiddenExist = 0;
  169 + }else{
  170 + if(isHiddenExist == 0){
  171 + pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';
  172 + isHiddenExist = 1;
  173 + }
191 } 174 }
192 } 175 }
193 } 176 }
194 } 177 }
195 pagingDivInnerHTML += '</div>'; 178 pagingDivInnerHTML += '</div>';
196 - pageNumContentBox.append(pagingDivInnerHTML); 179 + lanclassPageBox.append(pagingDivInnerHTML);
197 } 180 }
198 _gainClassDataErr(){ 181 _gainClassDataErr(){
199 - let classifyListContent = $('#classifyListContent');  
200 - classifyListContent.empty(); 182 + let lanclassContent = $('#lanclassContent');
  183 + lanclassContent.empty();
201 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>' 184 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>'
202 - classifyListContent.append(_classifyList) 185 + lanclassContent.append(_classifyList)
203 } 186 }
204 //工具类 187 //工具类
205 _format(str, obj) { 188 _format(str, obj) {
@@ -18,9 +18,14 @@ class ListDetailsApe extends Ape { @@ -18,9 +18,14 @@ class ListDetailsApe extends Ape {
18 } 18 }
19 19
20 init() { 20 init() {
21 - $('#themeBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//详情页  
22 - $('#collectYes ').on('click',this._collectYesHandler.bind(this));  
23 - $('#collectNo ').on('click',this._collectNoHandler.bind(this)); 21 + $('#liveContentAllBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//直播详情页
  22 + $('#liveListBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//首页 进入 直播详情页
  23 +
  24 + $('#lanclassAllBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//互动详情页
  25 + $('#lanclassList ').on('click','.classifyList',this._curriculumListHandler.bind(this));//首页 进入 互动详情页
  26 +
  27 + $('#teacherIntroAllBox ').on('click','.classifyList',this._teacherInfoHandler.bind(this));//老师详情页
  28 + $('#teacherIntro ').on('click','.classifyList',this._teacherInfoHandler.bind(this));//首页 进入 老师详情页
24 } 29 }
25 30
26 addEvent() { 31 addEvent() {
@@ -34,73 +39,120 @@ class ListDetailsApe extends Ape { @@ -34,73 +39,120 @@ class ListDetailsApe extends Ape {
34 $('#orderBtn').css('background','#3498db') 39 $('#orderBtn').css('background','#3498db')
35 } 40 }
36 41
  42 + this.commonalityClass();
37 43
38 - $('#slideshow').hide();  
39 - let _id = evt.currentTarget.id; 44 + let _id = $(evt.currentTarget).attr('data');
40 this._id = _id; 45 this._id = _id;
41 - let isDate = $(evt.currentTarget).attr('data');  
42 - this.isDate = isDate;  
43 - this.detailPage(_id); 46 + this.classInfoDetail(_id);
44 } 47 }
45 - _collectYesHandler(){  
46 - $('#collectYes ').hide();  
47 - $('#collectNo ').show(); 48 + commonalityClass(){
  49 + $('#slideshow').hide();
  50 + $('#defaultBox').hide();
  51 + $('#liveContentAllBox').hide();
  52 + $('#lanclassAllBox').hide();
  53 + $('#teacherIntroAllBox').hide();
48 } 54 }
49 - _collectNoHandler(){  
50 - $('#collectYes ').show();  
51 - $('#collectNo ').hide(); 55 + _teacherInfoHandler(evt){
  56 + this.commonalityClass();
  57 +
  58 + let _id = $(evt.currentTarget).attr('data');
  59 + this._id = _id;
  60 + this.teacherInfoDetail(_id);
52 } 61 }
53 - detailPage(_id){ 62 + classInfoDetail(_id){
54 let that = this; 63 let that = this;
55 - let signInfo = { 64 + let data = {
56 id: _id, 65 id: _id,
57 - siteId:'markettest' 66 + siteId:ClassDataProxy.siteId
58 } 67 }
59 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; 68 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
  69 + this.detailPage(_url,data,function(_data){
  70 + if(_data){
  71 + that._gainClassData(_data.returnData.data);
  72 + }
  73 + })
  74 + }
  75 + teacherInfoDetail(_id){
  76 + let that = this;
  77 + let data = {
  78 + id: _id,
  79 + siteId:ClassDataProxy.siteId,
  80 + userType : 1
  81 + }
  82 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUserByUserType';
  83 + this.detailPage(_url,data,function(_data){
  84 + if(_data){
  85 + that._classDateContent(_data.returnData.data);
  86 + }
  87 + })
  88 + }
  89 + detailPage(url,data,callback){
60 $.ajax({ 90 $.ajax({
61 - type: "post",  
62 - url: _url, 91 + type: "POST",
  92 + url: url,
63 timeout:5000, 93 timeout:5000,
64 - headers: {  
65 - siteId:ClassDataProxy.siteId,  
66 - 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'  
67 - },  
68 - data:signInfo, 94 + data : data,
  95 + headers: {siteId:ClassDataProxy.siteId,
  96 + 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
69 success:function(_data){ 97 success:function(_data){
70 - //获取课堂数据 98 + //获取我的课程数据
71 if(_data && _data.code == 200){ 99 if(_data && _data.code == 200){
72 - that._gainClassData(_data); 100 + if(callback){
  101 + callback(_data);
  102 + }
  103 + }else{
  104 + if(callback){
  105 + callback(null);
  106 + }
73 } 107 }
74 }, 108 },
75 error:function(error){ 109 error:function(error){
76 - console.log(error,'失败') 110 + //alert('直播数据获取失败')
  111 + if(callback){
  112 + callback(null);
  113 + }
  114 + loger.log(error,'直播数据获取失败')
77 } 115 }
78 }) 116 })
79 } 117 }
80 _gainClassData(_data){ 118 _gainClassData(_data){
81 - //切换列表内容  
82 - this._classDateContent(_data.returnData.data); 119 + let _dataList = _data.meetingInfo;
  120 + if(_dataList){
  121 + for(let i = 0;i<_dataList.length;i++){
  122 + let item = _dataList[i];
  123 + if(item.id == this._id ){
  124 + this._liveRender(item);
  125 + loger.log('课堂信息桑心',item)
  126 + }
  127 + }
  128 + }
83 } 129 }
84 _classDateContent(_data){ 130 _classDateContent(_data){
85 - let _dataList = _data.meetingInfo[0];  
86 - if(this.isDate){  
87 - this._lanclassRender(_dataList);  
88 - }else{  
89 - this._liveRender(_dataList); 131 +
  132 + let teacherList = _data.users;
  133 +
  134 + if(teacherList){
  135 + for(let i = 0;i<teacherList.length;i++){
  136 + let item = teacherList[i];
  137 + if(item.id == this._id){
  138 + this._lanclassRender(item);
  139 + }
  140 +
  141 + }
  142 +
90 } 143 }
91 - $('#classifyListBox').hide();  
92 } 144 }
93 - //互动课堂 145 + //老师
94 _lanclassRender(_dataList){ 146 _lanclassRender(_dataList){
95 $('#defaultBox').hide(); 147 $('#defaultBox').hide();
96 $('.curriculumBox').hide(); 148 $('.curriculumBox').hide();
97 $('#teacherDetailBox').show(); 149 $('#teacherDetailBox').show();
98 $('#teacherDetailBox').attr('data',this._id); 150 $('#teacherDetailBox').attr('data',this._id);
99 $('#teacherDetailInfoImg').attr('src','images/u293.png');//老师授课标题图片 151 $('#teacherDetailInfoImg').attr('src','images/u293.png');//老师授课标题图片
100 - $('#teacherDetailInfoDetailName').text(_dataList.userName);//老师名字 152 + $('#teacherDetailInfoDetailName').text(_dataList.user_name);//老师名字
101 $('#teacherDetailInfoDetailSex').text();//老师性别 153 $('#teacherDetailInfoDetailSex').text();//老师性别
102 $('#teacherDetailInfoDetailPoint').text();//老师专长 154 $('#teacherDetailInfoDetailPoint').text();//老师专长
103 - $('#teacherDetailInfoDetailAge').text(_dataList.capacity+'年');//老师教龄 155 + $('#teacherDetailInfoDetailAge').text(3+'年');//老师教龄
104 $('#teacherDetailInfoDetailGrade').text();//老师评分 156 $('#teacherDetailInfoDetailGrade').text();//老师评分
105 $('#teacherDetailReferralContent').text();//老师授课内容 157 $('#teacherDetailReferralContent').text();//老师授课内容
106 $('#teacherDetailPost').text();//老师职称 158 $('#teacherDetailPost').text();//老师职称
@@ -111,7 +163,7 @@ class ListDetailsApe extends Ape { @@ -111,7 +163,7 @@ class ListDetailsApe extends Ape {
111 $('#teacherDetailSynopsis').text();//老师授课简介 163 $('#teacherDetailSynopsis').text();//老师授课简介
112 164
113 } 165 }
114 - //直播课堂 166 + //课堂
115 _liveRender(_dataList){ 167 _liveRender(_dataList){
116 $('#defaultBox').hide(); 168 $('#defaultBox').hide();
117 $('.curriculumBox').hide(); 169 $('.curriculumBox').hide();
@@ -121,6 +173,7 @@ class ListDetailsApe extends Ape { @@ -121,6 +173,7 @@ class ListDetailsApe extends Ape {
121 $('#lanclassContentTitle').text(_dataList.meetingName);//老师授课标题 173 $('#lanclassContentTitle').text(_dataList.meetingName);//老师授课标题
122 $('#lanclassContentInfoPortrait').text();//老师授课老师头像 174 $('#lanclassContentInfoPortrait').text();//老师授课老师头像
123 $('#lanclassContentInfoName').text(_dataList.create_user);//老师授课老师名字 175 $('#lanclassContentInfoName').text(_dataList.create_user);//老师授课老师名字
  176 + $('#teacherInfoName').text(_dataList.create_user);//老师授课老师名字
124 $('#lanclassContentInfoTimeStart').text(_dataList.createTime);//老师授课开始时间 177 $('#lanclassContentInfoTimeStart').text(_dataList.createTime);//老师授课开始时间
125 $('#lanclassContentInfoTimeEnd').text(_dataList.endTime);//老师授课结束时间 178 $('#lanclassContentInfoTimeEnd').text(_dataList.endTime);//老师授课结束时间
126 $('#collectYes');//老师授课是否收藏 179 $('#collectYes');//老师授课是否收藏
@@ -6,9 +6,9 @@ import Loger from "../Loger"; @@ -6,9 +6,9 @@ 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 -let loger = Loger.getLoger('PC-LanclassApe'); 9 +let loger = Loger.getLoger('PC-LiveClassApe');
10 10
11 -const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> 11 +const classifyList = `<div class="classifyList {_classifyListR}" data="{_id}">
12 <img class="curriculumListImg" src="{_msgImg}" alt=""> 12 <img class="curriculumListImg" src="{_msgImg}" alt="">
13 <p class="curriculumListTit">{_classroomTitle}</p> 13 <p class="curriculumListTit">{_classroomTitle}</p>
14 <p class="curriculumListInfo"> 14 <p class="curriculumListInfo">
@@ -17,10 +17,9 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> @@ -17,10 +17,9 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}">
17 </p> 17 </p>
18 </div>`; 18 </div>`;
19 19
20 -class LanclassApe extends Ape { 20 +class LiveClassApe extends Ape {
21 constructor() { 21 constructor() {
22 super(); 22 super();
23 - this.classDateList = {};//课堂的所有数据  
24 this.addEvent(); 23 this.addEvent();
25 this.init(); 24 this.init();
26 } 25 }
@@ -30,10 +29,7 @@ class LanclassApe extends Ape { @@ -30,10 +29,7 @@ class LanclassApe extends Ape {
30 this._judgeListPlace(); 29 this._judgeListPlace();
31 $('#collectYes').hide(); 30 $('#collectYes').hide();
32 31
33 - $('#liveBtn').on('click',this._lanclassBtnHandler.bind(this));//直播课堂  
34 - $('#liveBtnMove').on('click',this._lanclassBtnHandler.bind(this));//直播课堂  
35 -  
36 - $('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页 32 + $('#livePageBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页
37 } 33 }
38 34
39 addEvent() { 35 addEvent() {
@@ -41,20 +37,16 @@ class LanclassApe extends Ape { @@ -41,20 +37,16 @@ class LanclassApe extends Ape {
41 } 37 }
42 _judgeListPlace(){ 38 _judgeListPlace(){
43 let i=(i%4); 39 let i=(i%4);
44 - $('#classifyListContent').find('.classifyList').eq(i==3).addClass('classifyListR'); 40 + $('#liveContent').find('.classifyList').eq(i==3).addClass('classifyListR');
45 } 41 }
46 - _lanclassBtnHandler(evt){  
47 - this._clearListContent();  
48 - this._showLoadingImg();  
49 - loger.log('互动',ClassDataProxy.userType)  
50 - let _ele = $(evt.target);  
51 - if(_ele.attr('data')){  
52 - $('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');  
53 - }  
54 - $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); 42 + isLocalStorage(){
55 $('#slideshow').hide(); 43 $('#slideshow').hide();
  44 +
56 $('#defaultBox').hide(); 45 $('#defaultBox').hide();
57 - $('#classifyListBox').show(); 46 + $('#liveContentAllBox').show();
  47 + $('#lanclassAllBox').hide();
  48 + $('#teacherIntroAllBox').hide();
  49 +
58 $('#teacherDetailBox').hide(); 50 $('#teacherDetailBox').hide();
59 $('#lanclassBox').hide(); 51 $('#lanclassBox').hide();
60 $('#myCenterBox').hide(); 52 $('#myCenterBox').hide();
@@ -77,13 +69,11 @@ class LanclassApe extends Ape { @@ -77,13 +69,11 @@ class LanclassApe extends Ape {
77 }, 69 },
78 data:{siteId:ClassDataProxy.siteId}, 70 data:{siteId:ClassDataProxy.siteId},
79 success:function(_data){ 71 success:function(_data){
80 - if(_data != 200 ){  
81 - // loger.warn(_data.data.msg)  
82 - }  
83 - that.classDateList = _data.returnData.data;  
84 //切换列表内容 72 //切换列表内容
85 - that._classDateContent(that.classDateList);  
86 - loger.log(_data,'成功') 73 + if(_data && _data.code == 200){
  74 + that._classDateContent(_data.returnData.data);
  75 + loger.log(_data,'成功')
  76 + }
87 }, 77 },
88 error:function(error){ 78 error:function(error){
89 //alert('直播翻页数据获取失败') 79 //alert('直播翻页数据获取失败')
@@ -101,13 +91,15 @@ class LanclassApe extends Ape { @@ -101,13 +91,15 @@ class LanclassApe extends Ape {
101 type: "POST", 91 type: "POST",
102 url: _url, 92 url: _url,
103 timeout:5000, 93 timeout:5000,
104 - data:{siteId:ClassDataProxy.siteId}, 94 + data:{siteId:ClassDataProxy.siteId,meetingStatus:2},
105 headers: {siteId:ClassDataProxy.siteId, 95 headers: {siteId:ClassDataProxy.siteId,
106 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, 96 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
107 success:function(_data){ 97 success:function(_data){
108 - // loger.log(_data,'成功')  
109 //获取课堂数据 98 //获取课堂数据
110 - that._gainClassData(_data); 99 + if(_data && _data.code ==200){
  100 + that._gainClassData(_data.returnData.data);
  101 + }
  102 +
111 }, 103 },
112 error:function(error){ 104 error:function(error){
113 //alert('直播数据获取失败') 105 //alert('直播数据获取失败')
@@ -117,44 +109,36 @@ class LanclassApe extends Ape { @@ -117,44 +109,36 @@ class LanclassApe extends Ape {
117 }) 109 })
118 } 110 }
119 _gainClassData(_data){ 111 _gainClassData(_data){
120 - if(_data && _data.code == 200){  
121 - this.classDateList = _data.returnData.data;  
122 - let classifyListContent = $('#classifyListContent');  
123 - classifyListContent.empty();  
124 - //切换列表分类的标题  
125 - this._classDateTitle(); 112 + if(_data){
  113 + let liveContent = $('#liveContent');
  114 + liveContent.empty();
126 //切换列表内容 115 //切换列表内容
127 - this._classDateContent(this.classDateList); 116 + this._classDateContent(_data);
128 //页码 117 //页码
129 - this._classDatepageNum(this.classDateList); 118 + this._classDatepageNum(_data);
130 } 119 }
131 } 120 }
132 _gainClassDataErr(){ 121 _gainClassDataErr(){
133 - let classifyListContent = $('#classifyListContent');  
134 - classifyListContent.empty(); 122 + let liveContent = $('#liveContent');
  123 + liveContent.empty();
135 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>' 124 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>'
136 - classifyListContent.append(_classifyList)  
137 - }  
138 - _classDateTitle(){  
139 - $('#classifyListTitle').html($('.header_listMsgCheck').attr('data')); 125 + liveContent.append(_classifyList)
140 } 126 }
141 //清楚列表数据 127 //清楚列表数据
142 _clearListContent(){ 128 _clearListContent(){
143 - let classifyListContent = $('#classifyListContent');  
144 - classifyListContent.empty();  
145 - let classifyListTitle = $('#classifyListTitle');  
146 - classifyListTitle.empty();  
147 - let pageNumContentBox = $('#pageNumContentBox');  
148 - pageNumContentBox.empty(); 129 + let liveContent = $('#liveContent');
  130 + liveContent.empty();
  131 + let livePageBox = $('#livePageBox');
  132 + livePageBox.empty();
149 } 133 }
150 //列表显示loading 134 //列表显示loading
151 _showLoadingImg(){ 135 _showLoadingImg(){
152 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`; 136 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`;
153 - $('#classifyListContent').append(loadingImg); 137 + $('#livePageBox').append(loadingImg);
154 } 138 }
155 _classDateContent(_data){ 139 _classDateContent(_data){
156 - let classifyListContent = $('#classifyListContent');  
157 - classifyListContent.empty(); 140 + let liveContent = $('#liveContent');
  141 + liveContent.empty();
158 let _dataList = _data.meetingInfo; 142 let _dataList = _data.meetingInfo;
159 if(_dataList){ 143 if(_dataList){
160 for(let i = 0;i<_dataList.length;i++){ 144 for(let i = 0;i<_dataList.length;i++){
@@ -168,7 +152,7 @@ class LanclassApe extends Ape { @@ -168,7 +152,7 @@ class LanclassApe extends Ape {
168 _schoolTime : _getTime, 152 _schoolTime : _getTime,
169 _subscribeNum : _dataList[i].reservationNumber+'人预约' 153 _subscribeNum : _dataList[i].reservationNumber+'人预约'
170 }) 154 })
171 - classifyListContent.append(_classifyList); 155 + liveContent.append(_classifyList);
172 } 156 }
173 } 157 }
174 } 158 }
@@ -179,27 +163,29 @@ class LanclassApe extends Ape { @@ -179,27 +163,29 @@ class LanclassApe extends Ape {
179 this.pagingConstruct(1,_pageNum); 163 this.pagingConstruct(1,_pageNum);
180 } 164 }
181 pagingConstruct(paging,total){ 165 pagingConstruct(paging,total){
182 - let pageNumContentBox = $('#pageNumContentBox');  
183 - pageNumContentBox.empty(); 166 + let livePageBox = $('#livePageBox');
  167 + livePageBox.empty();
184 let pagingDivInnerHTML = '<div class="pageNumContent">'; 168 let pagingDivInnerHTML = '<div class="pageNumContent">';
185 let isHiddenExist = 0; 169 let isHiddenExist = 0;
186 - for(let i =1 ;i<=total;i++){  
187 - if(i == paging){  
188 - pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';  
189 - }else{  
190 - if (i < 4 || i < (paging + 4) && i > (paging - 2) && i < (total / 2 + 2) || i > (total - 2)) {  
191 - pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';  
192 - isHiddenExist = 0; 170 + if(total > 1){
  171 + for(let i =1 ;i<=total;i++){
  172 + if(i == paging){
  173 + pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';
193 }else{ 174 }else{
194 - if(isHiddenExist == 0){  
195 - pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';  
196 - isHiddenExist = 1; 175 + if (i < 4 || i < (paging + 3) && i > (paging - 2) || i > (total / 2 - 2) && i < (total / 2 + 2) || i > (total - 3)) {
  176 + pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';
  177 + isHiddenExist = 0;
  178 + }else{
  179 + if(isHiddenExist == 0){
  180 + pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';
  181 + isHiddenExist = 1;
  182 + }
197 } 183 }
198 } 184 }
199 } 185 }
200 } 186 }
201 pagingDivInnerHTML += '</div>'; 187 pagingDivInnerHTML += '</div>';
202 - pageNumContentBox.append(pagingDivInnerHTML); 188 + livePageBox.append(pagingDivInnerHTML);
203 } 189 }
204 //工具类 190 //工具类
205 _format(str, obj) { 191 _format(str, obj) {
@@ -208,4 +194,4 @@ class LanclassApe extends Ape { @@ -208,4 +194,4 @@ class LanclassApe extends Ape {
208 }); 194 });
209 }; 195 };
210 } 196 }
211 -export default LanclassApe;  
  197 +export default LiveClassApe;
@@ -114,6 +114,9 @@ class MyCenterApe extends Ape { @@ -114,6 +114,9 @@ class MyCenterApe extends Ape {
114 114
115 $('#teacherUI li').on('click',this._recordLiHandler.bind(this));//课堂分类 115 $('#teacherUI li').on('click',this._recordLiHandler.bind(this));//课堂分类
116 $('#teacherInfoList li').on('click',this._teacherInfoListHandler.bind(this));//直播分类 正在直播 未开始 已结束 116 $('#teacherInfoList li').on('click',this._teacherInfoListHandler.bind(this));//直播分类 正在直播 未开始 已结束
  117 + $('#studentInfoList li').on('click',this._studentInfoListHandler.bind(this));//首页 学生 待学习 已学完 收藏
  118 + $('#courseInfoList li').on('click',this._courseInfoListHandler.bind(this));//我的课程 学生 待学习 已学完 收藏
  119 +
117 $('#subscribeList .liveInfoLeftLi').on('click',this._subscribeListHandler.bind(this));//课程 老师 120 $('#subscribeList .liveInfoLeftLi').on('click',this._subscribeListHandler.bind(this));//课程 老师
118 121
119 $('#updateInputYes').on('click',this._updateInputYesHandler.bind(this));//确定时把输入的信息存入数据中 122 $('#updateInputYes').on('click',this._updateInputYesHandler.bind(this));//确定时把输入的信息存入数据中
@@ -150,6 +153,8 @@ class MyCenterApe extends Ape { @@ -150,6 +153,8 @@ class MyCenterApe extends Ape {
150 153
151 $('#teacherCorrelatedInfo').on('click','.teachercourseImg',this._teacherClassDetails.bind(this));//点击进入老师课堂详情页 154 $('#teacherCorrelatedInfo').on('click','.teachercourseImg',this._teacherClassDetails.bind(this));//点击进入老师课堂详情页
152 155
  156 +
  157 +
153 $('#teacherMyCerterHomePage').on('click',this._homePageHandler.bind(this));//首页 158 $('#teacherMyCerterHomePage').on('click',this._homePageHandler.bind(this));//首页
154 $('#teacherMyCerterUpPage').on('click',this._upPageHandler.bind(this));//上页 159 $('#teacherMyCerterUpPage').on('click',this._upPageHandler.bind(this));//上页
155 $('#teacherMyCerterDownPage').on('click',this._downPageHandler.bind(this));//下页 160 $('#teacherMyCerterDownPage').on('click',this._downPageHandler.bind(this));//下页
@@ -249,13 +254,14 @@ class MyCenterApe extends Ape { @@ -249,13 +254,14 @@ class MyCenterApe extends Ape {
249 } 254 }
250 }) 255 })
251 } 256 }
252 - _studentCurriculumInfo(num,callback){ 257 + _studentCurriculumInfo(data,num,callback){
253 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/getStudentMeetingByStudentId/'+ClassDataProxy.id; 258 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/getStudentMeetingByStudentId/'+ClassDataProxy.id;
254 let that = this; 259 let that = this;
255 $.ajax({ 260 $.ajax({
256 type: "GET", 261 type: "GET",
257 url: _url, 262 url: _url,
258 timeout:5000, 263 timeout:5000,
  264 + data:data,
259 headers: {siteId:ClassDataProxy.siteId,pageno:num,id:ClassDataProxy.id, 265 headers: {siteId:ClassDataProxy.siteId,pageno:num,id:ClassDataProxy.id,
260 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, 266 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
261 success:function(_data){ 267 success:function(_data){
@@ -289,9 +295,25 @@ class MyCenterApe extends Ape { @@ -289,9 +295,25 @@ class MyCenterApe extends Ape {
289 } 295 }
290 detailPageStudent(){ 296 detailPageStudent(){
291 //首页课程 297 //首页课程
292 - this._studentCourseModule();  
293 - //首页显示信息  
294 - this._studentStudyModule(); 298 + let ind = $('#studentInfoList .liveInfoLeftLiCheck').attr('data');
  299 + let studentMyCenterContentList = $('#studentMyCenterContentList');
  300 + switch (parseInt(ind)){
  301 + case 0:
  302 + //待学习
  303 + this._studentStudyModule(studentMyCenterContentList);
  304 + break;
  305 + case 1:
  306 + //已学完
  307 + this._studentStudyOverModule(studentMyCenterContentList);
  308 + break;
  309 + case 2:
  310 + //收藏
  311 + this._studenTcollectModule(studentMyCenterContentList);
  312 + break;
  313 + default:
  314 + return;
  315 + }
  316 +
295 } 317 }
296 318
297 isLocalStorage(){ 319 isLocalStorage(){
@@ -363,11 +385,25 @@ class MyCenterApe extends Ape { @@ -363,11 +385,25 @@ class MyCenterApe extends Ape {
363 this.detailPageStudent(); 385 this.detailPageStudent();
364 } 386 }
365 } 387 }
366 - _teacherInfoListHandler(evt){ 388 + //切换类的公用样式
  389 + commonality(evt){
367 $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); 390 $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck');
368 } 391 }
  392 + _teacherInfoListHandler(evt){
  393 + this.commonality(evt);
  394 + }
  395 + //学生端 首页
  396 + _studentInfoListHandler(evt){
  397 + this.commonality(evt);
  398 + this.detailPageStudent();
  399 + }
  400 + //学生端 我的课程
  401 + _courseInfoListHandler(evt){
  402 + this.commonality(evt);
  403 + this.studentCourses();
  404 + }
369 _subscribeListHandler(evt){ 405 _subscribeListHandler(evt){
370 - $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); 406 + this.commonality(evt);
371 this.studentBookings(); 407 this.studentBookings();
372 } 408 }
373 /*-------------------老师-------------------*/ 409 /*-------------------老师-------------------*/
@@ -496,7 +532,7 @@ class MyCenterApe extends Ape { @@ -496,7 +532,7 @@ class MyCenterApe extends Ape {
496 /*---------------------------学生-----------------------*/ 532 /*---------------------------学生-----------------------*/
497 _studentCourseModule(){ 533 _studentCourseModule(){
498 let that = this; 534 let that = this;
499 - this._studentCurriculumInfo(3,function(_data){ 535 + this._studentCurriculumInfo({},3,function(_data){
500 that.studentCourseList(_data.returnData.data); 536 that.studentCourseList(_data.returnData.data);
501 }) 537 })
502 } 538 }
@@ -508,12 +544,13 @@ class MyCenterApe extends Ape { @@ -508,12 +544,13 @@ class MyCenterApe extends Ape {
508 if(_data) { 544 if(_data) {
509 for (let i = 0; i < _data.length; i++) { 545 for (let i = 0; i < _data.length; i++) {
510 let item = _data[i]; 546 let item = _data[i];
  547 + let timer = ClassDataProxy.getTimeCountDown(item.meetingBeginTime)
511 if (item) { 548 if (item) {
512 let curInfo = this._format(curriculumList, { 549 let curInfo = this._format(curriculumList, {
513 _infoTit: item.meeting_name, 550 _infoTit: item.meeting_name,
514 _meetingNumber: item.meetingNumber, 551 _meetingNumber: item.meetingNumber,
515 - _countDown: that.loadMeeting(item),  
516 - _isShow: (that.loadMeeting(item) == '已开始') ? 'block' : 'none' 552 + _countDown:timer ,
  553 + _isShow: (timer == '已结束') ? 'none' : 'block'
517 }) 554 })
518 myCurriculumInfo.append(curInfo); 555 myCurriculumInfo.append(curInfo);
519 } else { 556 } else {
@@ -524,36 +561,100 @@ class MyCenterApe extends Ape { @@ -524,36 +561,100 @@ class MyCenterApe extends Ape {
524 } 561 }
525 } 562 }
526 } 563 }
527 - _studentStudyModule(){  
528 - let that = this;  
529 - this._studentCurriculumInfo(4,function(_data){  
530 - that.studentStudyList(_data.returnData.data); 564 +
  565 + _studentStudyModule(studentMyCenterContentList){
  566 + let that = this;
  567 + this._studentCurriculumInfo({},4,function(_data){
  568 + if(_data){
  569 + that.studentStudyList(studentMyCenterContentList,_data.returnData.data);
  570 + }
531 }) 571 })
532 } 572 }
533 - studentStudyList(_data){  
534 - let studentMyCenterContentList = $('#studentMyCenterContentList'); 573 + studentStudyList(studentMyCenterContentList,_data){
535 studentMyCenterContentList.empty(); 574 studentMyCenterContentList.empty();
536 $('#courseMinutePageBox').hide(); 575 $('#courseMinutePageBox').hide();
  576 + for(let i = 0;i<_data.length;i++){
  577 + if(_data[i]){
  578 + if(ClassDataProxy.getTimeDay(_data[i].meetingBeginTime)){
  579 + let j = (i%4)==3;
  580 + let _classifyList = this._format(classifyList,{
  581 + _classifyListR : j?'classifyListR':'',
  582 + _isShowTitle : 'none',
  583 + _meetingNumber : _data[i].meetingNumber,
  584 + _msgImg : '../images/u373.png',
  585 + _meetingName : _data[i].meeting_name,
  586 + _create_user : _data[i].teacherName,
  587 + _liveTimer : _data[i].meetingBeginTime.split(' ')[0]
  588 + })
  589 + studentMyCenterContentList.append(_classifyList)
  590 + }
  591 + }else{
  592 + console.error('_gainClassData没数据')
  593 + }
  594 + }
537 595
  596 + }
  597 + //已学完
  598 + _studentStudyOverModule(studentMyCenterContentList){
  599 + let that = this;
  600 + this._studentCurriculumInfo({},4,function(_data){
  601 + that.studentStudyOverList(studentMyCenterContentList,_data.returnData.data);
  602 + })
  603 + }
  604 + studentStudyOverList(studentMyCenterContentList,_data){
  605 + studentMyCenterContentList.empty();
  606 + $('#courseMinutePageBox').hide();
538 for(let i = 0;i<_data.length;i++){ 607 for(let i = 0;i<_data.length;i++){
539 if(_data[i]){ 608 if(_data[i]){
540 - let j = (i%4)==3;  
541 - let _classifyList = this._format(classifyList,{  
542 - _classifyListR : j?'classifyListR':'',  
543 - _isShowTitle : 'none',  
544 - _meetingNumber : _data[i].meetingNumber,  
545 - _msgImg : '../images/u373.png',  
546 - _meetingName : _data[i].meeting_name,  
547 - _create_user : _data[i].teacherName,  
548 - _liveTimer : _data[i].meetingBeginTime.split(' ')[0]  
549 - })  
550 - studentMyCenterContentList.append(_classifyList) 609 + if(!ClassDataProxy.getTimeDay(_data[i].meetingBeginTime)){
  610 + let j = (i%4)==3;
  611 + let _classifyList = this._format(classifyList,{
  612 + _classifyListR : j?'classifyListR':'',
  613 + _isShowTitle : 'none',
  614 + _meetingNumber : _data[i].meetingNumber,
  615 + _msgImg : '../images/u373.png',
  616 + _meetingName : _data[i].meeting_name,
  617 + _create_user : _data[i].teacherName,
  618 + _liveTimer : _data[i].meetingBeginTime.split(' ')[0]
  619 + })
  620 + studentMyCenterContentList.append(_classifyList)
  621 + }
551 }else{ 622 }else{
552 console.error('_gainClassData没数据') 623 console.error('_gainClassData没数据')
553 } 624 }
554 } 625 }
555 626
556 } 627 }
  628 + _studenTcollectModule(studentMyCenterContentList){
  629 + let that = this;
  630 + this._studentCurriculumInfo({},4,function(_data){
  631 + that.studentTcollectList(studentMyCenterContentList,_data.returnData.data);
  632 + })
  633 + }
  634 + studentTcollectList(studentMyCenterContentList,_data){
  635 + studentMyCenterContentList.empty();
  636 + $('#courseMinutePageBox').hide();
  637 + /* for(let i = 0;i<_data.length;i++){
  638 + if(_data[i]){
  639 + if(!ClassDataProxy.getTimeDay(_data[i].meetingBeginTime)){
  640 + let j = (i%4)==3;
  641 + let _classifyList = this._format(classifyList,{
  642 + _classifyListR : j?'classifyListR':'',
  643 + _isShowTitle : 'none',
  644 + _meetingNumber : _data[i].meetingNumber,
  645 + _msgImg : '../images/u373.png',
  646 + _meetingName : _data[i].meeting_name,
  647 + _create_user : _data[i].teacherName,
  648 + _liveTimer : _data[i].meetingBeginTime.split(' ')[0]
  649 + })
  650 + studentMyCenterContentList.append(_classifyList)
  651 + }
  652 + }else{
  653 + console.error('_gainClassData没数据')
  654 + }
  655 + }*/
  656 +
  657 + }
557 //提交用户信息修改 658 //提交用户信息修改
558 _accountInfoSaveBtnHandler(){ 659 _accountInfoSaveBtnHandler(){
559 let id = ClassDataProxy.id;//id 660 let id = ClassDataProxy.id;//id
@@ -651,7 +752,7 @@ class MyCenterApe extends Ape { @@ -651,7 +752,7 @@ class MyCenterApe extends Ape {
651 studentBookings(){ 752 studentBookings(){
652 let that = this; 753 let that = this;
653 let data = $('#subscribeList').find('.liveInfoLeftLiCheck').attr('data'); 754 let data = $('#subscribeList').find('.liveInfoLeftLiCheck').attr('data');
654 - this._studentCurriculumInfo(12,function(_data){ 755 + this._studentCurriculumInfo({},12,function(_data){
655 if(_data){ 756 if(_data){
656 if(data == '1'){ 757 if(data == '1'){
657 that._studentSubscribeTeacher(_data.returnData.data) 758 that._studentSubscribeTeacher(_data.returnData.data)
@@ -738,13 +839,202 @@ class MyCenterApe extends Ape { @@ -738,13 +839,202 @@ class MyCenterApe extends Ape {
738 that._teacherCourse(_data.returnData.data); 839 that._teacherCourse(_data.returnData.data);
739 }) 840 })
740 } 841 }
  842 + //学生端 我的课程 切换
741 studentCourses(){ 843 studentCourses(){
  844 + let ind = $('#courseInfoList .liveInfoLeftLiCheck').attr('data');
  845 + let courseMinuteList = $('#courseMinuteList');
  846 + switch (parseInt(ind)){
  847 + case 0:
  848 + //待学习
  849 + this.studentFutureModule(courseMinuteList);
  850 + break;
  851 + case 1:
  852 + //已学完
  853 + this.studentFormerlyModule(courseMinuteList);
  854 + break;
  855 + case 2:
  856 + //收藏
  857 + this.studentCollectModule(courseMinuteList);
  858 + break;
  859 + default:
  860 + return;
  861 + }
  862 +
  863 + }
  864 + //学生端 我的课程 待学习
  865 + studentFutureModule(courseMinuteList){
742 let that = this; 866 let that = this;
743 - this._studentCurriculumInfo(12,function(_data){ 867 + this._studentCurriculumInfo({},12,function(_data){
744 if(_data){ 868 if(_data){
745 - that._studentCourseRender(_data.returnData.data) 869 + that._studentCourseRender(courseMinuteList,_data.returnData.data)
746 } 870 }
747 }); 871 });
  872 +
  873 + }
  874 + //学生端课程数据 待学习
  875 + _studentCourseRender(courseMinuteList,_data){
  876 + courseMinuteList.empty();
  877 + let count = _data.count;
  878 + let page = _data.page;
  879 + let pageno = _data.pageno;
  880 + let pagenum = Math.ceil(count / pageno);
  881 + let _dataList = _data;
  882 + this.pageNo = pagenum;
  883 + $('#courseMinutePageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
  884 +
  885 + if(count <= 12){
  886 + $('#courseMinutePageBox').hide();
  887 + }
  888 + //存储数据按日期分类
  889 + this.dataList={};
  890 + //if(ClassDataProxy.getTimeDay(_data[i].meetingBeginTime)){
  891 + for(let i = 0;i<_dataList.length;i++){
  892 + let item=_dataList[i];
  893 + if(item){
  894 + let temp = item.meetingBeginTime.split(' ')[0]
  895 + if(!this.dataList[temp]) {
  896 + this.dataList[temp] = [];
  897 + }
  898 + this.dataList[temp].push(item)
  899 + }
  900 + }
  901 + for(let key in this.dataList){
  902 + if(ClassDataProxy.getTimeDay(key)){
  903 + let arrList = this.dataList[key];
  904 + if(arrList){
  905 + for(let n = 0;n<arrList.length;n++){
  906 + let j = (n%4) == 3;
  907 + let _classifyList = this._format(classifyList,{
  908 + _classifyListR : j ?'classifyListR':'',
  909 + _isShowTitle : n == 0 ?'block':'none',
  910 + _meetingNumber : arrList[n].meetingNumber,
  911 + _msgImg : '../images/u373.png',
  912 + _meetingName : arrList[n].meeting_name,
  913 + _create_user : arrList[n].teacherName,
  914 + _liveTimer : key
  915 + })
  916 + courseMinuteList.append(_classifyList)
  917 + }
  918 + }
  919 + }
  920 +
  921 + }
  922 + }
  923 + //学生端 我的课程 已学完
  924 + studentFormerlyModule(courseMinuteList){
  925 + let that = this;
  926 + this._studentCurriculumInfo({},12,function(_data){
  927 + if(_data){
  928 + that._studentFormerlyRender(courseMinuteList,_data.returnData.data)
  929 + }
  930 + });
  931 + }
  932 + //学生端课程数据 已学完
  933 + _studentFormerlyRender(courseMinuteList,_data){
  934 + courseMinuteList.empty();
  935 + let count = _data.count;
  936 + let page = _data.page;
  937 + let pageno = _data.pageno;
  938 + let pagenum = Math.ceil(count / pageno);
  939 + let _dataList = _data;
  940 + this.pageNo = pagenum;
  941 + $('#courseMinutePageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
  942 +
  943 + if(count <= 12){
  944 + $('#courseMinutePageBox').hide();
  945 + }
  946 + //存储数据按日期分类
  947 + this.dataList={};
  948 + for(let i = 0;i<_dataList.length;i++){
  949 + let item=_dataList[i];
  950 + if(item){
  951 + let temp = item.meetingBeginTime.split(' ')[0]
  952 + if(!this.dataList[temp]) {
  953 + this.dataList[temp] = [];
  954 + }
  955 + this.dataList[temp].push(item)
  956 + }
  957 + }
  958 + for(let key in this.dataList){
  959 + if(!ClassDataProxy.getTimeDay(key)){
  960 + let arrList = this.dataList[key];
  961 + if(arrList){
  962 + for(let n = 0;n<arrList.length;n++){
  963 + let j = (n%4) == 3;
  964 + let _classifyList = this._format(classifyList,{
  965 + _classifyListR : j ?'classifyListR':'',
  966 + _isShowTitle : n == 0 ?'block':'none',
  967 + _meetingNumber : arrList[n].meetingNumber,
  968 + _msgImg : '../images/u373.png',
  969 + _meetingName : arrList[n].meeting_name,
  970 + _create_user : arrList[n].teacherName,
  971 + _liveTimer : key
  972 + })
  973 + courseMinuteList.append(_classifyList)
  974 + }
  975 + }
  976 + }
  977 +
  978 + }
  979 + }
  980 + //学生端 我的课程 收藏
  981 + studentCollectModule(courseMinuteList){
  982 + let that = this;
  983 + let data = {}
  984 + this._studentCurriculumInfo(data,12,function(_data){
  985 + if(_data){
  986 + loger.log('显示收藏数据',_data)
  987 + that._studentCollectRender(courseMinuteList,_data.returnData.data)
  988 + }
  989 + });
  990 + }
  991 + //学生端课程数据 收藏
  992 + _studentCollectRender(courseMinuteList,_data){
  993 + courseMinuteList.empty();
  994 + let count = _data.count;
  995 + let page = _data.page;
  996 + let pageno = _data.pageno;
  997 + let pagenum = Math.ceil(count / pageno);
  998 + let _dataList = _data;
  999 + this.pageNo = pagenum;
  1000 + $('#courseMinutePageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');
  1001 +
  1002 + if(count <= 12){
  1003 + $('#courseMinutePageBox').hide();
  1004 + }
  1005 + //存储数据按日期分类
  1006 + this.dataList={};
  1007 + for(let i = 0;i<_dataList.length;i++){
  1008 + let item=_dataList[i];
  1009 + if(item){
  1010 + let temp = item.meetingBeginTime.split(' ')[0]
  1011 + if(!this.dataList[temp]) {
  1012 + this.dataList[temp] = [];
  1013 + }
  1014 + this.dataList[temp].push(item)
  1015 + }
  1016 + }
  1017 + for(let key in this.dataList){
  1018 + if(!ClassDataProxy.getTimeDay(key)){
  1019 + let arrList = this.dataList[key];
  1020 + if(arrList){
  1021 + for(let n = 0;n<arrList.length;n++){
  1022 + let j = (n%4) == 3;
  1023 + let _classifyList = this._format(classifyList,{
  1024 + _classifyListR : j ?'classifyListR':'',
  1025 + _isShowTitle : n == 0 ?'block':'none',
  1026 + _meetingNumber : arrList[n].meetingNumber,
  1027 + _msgImg : '../images/u373.png',
  1028 + _meetingName : arrList[n].meeting_name,
  1029 + _create_user : arrList[n].teacherName,
  1030 + _liveTimer : key
  1031 + })
  1032 + // courseMinuteList.append(_classifyList)
  1033 + }
  1034 + }
  1035 + }
  1036 +
  1037 + }
748 } 1038 }
749 //老师端首页显示课程 1039 //老师端首页显示课程
750 _teacherHomeCourse(_data){ 1040 _teacherHomeCourse(_data){
@@ -854,53 +1144,7 @@ class MyCenterApe extends Ape { @@ -854,53 +1144,7 @@ class MyCenterApe extends Ape {
854 } 1144 }
855 } 1145 }
856 } 1146 }
857 - //学生端课程数据  
858 - _studentCourseRender(_data){  
859 - let courseMinuteList = $('#courseMinuteList');  
860 - courseMinuteList.empty();  
861 - let count = _data.count;  
862 - let page = _data.page;  
863 - let pageno = _data.pageno;  
864 - let pagenum = Math.ceil(count / pageno);  
865 - let _dataList = _data;  
866 - this.pageNo = pagenum;  
867 - $('#courseMinutePageMsg').html('第'+page+'页/共'+pagenum+'页，有'+count+'个记录');  
868 -  
869 - if(count <= 12){  
870 - $('#courseMinutePageBox').hide();  
871 - }  
872 - //存储数据按日期分类  
873 - this.dataList={};  
874 - for(let i = 0;i<_dataList.length;i++){  
875 - let item=_dataList[i];  
876 - if(item){  
877 - let temp = item.meetingBeginTime.split(' ')[0]  
878 - if(!this.dataList[temp]) {  
879 - this.dataList[temp] = [];  
880 - }  
881 - this.dataList[temp].push(item)  
882 - }  
883 - }  
884 - for(let key in this.dataList){  
885 1147
886 - let arrList = this.dataList[key];  
887 - if(arrList){  
888 - for(let n = 0;n<arrList.length;n++){  
889 - let j = (n%4) == 3;  
890 - let _classifyList = this._format(classifyList,{  
891 - _classifyListR : j ?'classifyListR':'',  
892 - _isShowTitle : n == 0 ?'block':'none',  
893 - _meetingNumber : arrList[n].meetingNumber,  
894 - _msgImg : '../images/u373.png',  
895 - _meetingName : arrList[n].meeting_name,  
896 - _create_user : arrList[n].teacherName,  
897 - _liveTimer : key  
898 - })  
899 - courseMinuteList.append(_classifyList)  
900 - }  
901 - }  
902 - }  
903 - }  
904 //修改密码 1148 //修改密码
905 _accountPassWordBtnHandler(){ 1149 _accountPassWordBtnHandler(){
906 this.data = 0; 1150 this.data = 0;
@@ -1030,6 +1274,7 @@ class MyCenterApe extends Ape { @@ -1030,6 +1274,7 @@ class MyCenterApe extends Ape {
1030 } 1274 }
1031 } 1275 }
1032 } 1276 }
  1277 + //取消预约
1033 _cancelSubscribeHandler(evt){ 1278 _cancelSubscribeHandler(evt){
1034 let _id = $(evt.target).attr('data'); 1279 let _id = $(evt.target).attr('data');
1035 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+_id; 1280 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/updateStudentMeetingBySite/'+_id;
@@ -21,9 +21,6 @@ class SubscribeApe extends Ape { @@ -21,9 +21,6 @@ class SubscribeApe extends Ape {
21 init() { 21 init() {
22 $('#lanclassContentApply').on('click',this._lanclassContentApplyHandler.bind(this));//我要报名 22 $('#lanclassContentApply').on('click',this._lanclassContentApplyHandler.bind(this));//我要报名
23 $('#orderBtn').on('click',this._lanclassContentApplyHandler.bind(this));//我要预约 23 $('#orderBtn').on('click',this._lanclassContentApplyHandler.bind(this));//我要预约
24 - $('#collectYes').on('click',this._lanclassContentApplyHandler.bind(this));//取消收藏  
25 - $('#collectNo').on('click',this._lanclassContentApplyHandler.bind(this));//收藏  
26 -  
27 } 24 }
28 25
29 addEvent() { 26 addEvent() {
@@ -51,6 +48,7 @@ class SubscribeApe extends Ape { @@ -51,6 +48,7 @@ class SubscribeApe extends Ape {
51 if(_data && _data.code == 200){ 48 if(_data && _data.code == 200){
52 loger.log(_data,'预约信息') 49 loger.log(_data,'预约信息')
53 $('#teacherDetailRemindersBox').show(); 50 $('#teacherDetailRemindersBox').show();
  51 + that._emit(MessageTypes.ORDER_FINISH);
54 }else if(_data.returnData.data.msg == '您已预约这堂课' && ClassDataProxy.loginName){ 52 }else if(_data.returnData.data.msg == '您已预约这堂课' && ClassDataProxy.loginName){
55 ErrorApe.showWarnError('您已预约这堂课'); 53 ErrorApe.showWarnError('您已预约这堂课');
56 }else{ 54 }else{
@@ -9,7 +9,7 @@ import ClassDataProxy from "proxy/ClassDataProxy"; @@ -9,7 +9,7 @@ import ClassDataProxy from "proxy/ClassDataProxy";
9 9
10 let loger = Loger.getLoger('PC-TeacherDetailApe'); 10 let loger = Loger.getLoger('PC-TeacherDetailApe');
11 11
12 -const classifyList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}"> 12 +const classifyList = `<div class="classifyList {_classifyListR}" data="{_id}">
13 <img class="curriculumListImg" src="{_msgImg}" alt=""> 13 <img class="curriculumListImg" src="{_msgImg}" alt="">
14 <p class="curriculumListTit">{_classroomTitle}</p> 14 <p class="curriculumListTit">{_classroomTitle}</p>
15 <p class="curriculumListInfo"> 15 <p class="curriculumListInfo">
@@ -21,8 +21,6 @@ const classifyList = `<div class="classifyList {_classifyListR}" data="1" id="{_ @@ -21,8 +21,6 @@ const classifyList = `<div class="classifyList {_classifyListR}" data="1" id="{_
21 class TeacherDetailApe extends Ape { 21 class TeacherDetailApe extends Ape {
22 constructor() { 22 constructor() {
23 super(); 23 super();
24 - this.classDateList = {};//课堂的所有数据  
25 - this.isLocalStorage();  
26 this.addEvent(); 24 this.addEvent();
27 this.init(); 25 this.init();
28 } 26 }
@@ -30,10 +28,7 @@ class TeacherDetailApe extends Ape { @@ -30,10 +28,7 @@ class TeacherDetailApe extends Ape {
30 init() { 28 init() {
31 $('#collectYes').hide(); 29 $('#collectYes').hide();
32 30
33 - $('#teacherBtn').on('click',this._teacherBtnHandler.bind(this));//推荐老师  
34 - $('#teacherBtnMove').on('click',this._teacherBtnHandler.bind(this));//推荐老师  
35 -  
36 - $('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页 31 + $('#teacherIntroPageBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页
37 32
38 } 33 }
39 34
@@ -41,18 +36,6 @@ class TeacherDetailApe extends Ape { @@ -41,18 +36,6 @@ class TeacherDetailApe extends Ape {
41 36
42 } 37 }
43 isLocalStorage(){ 38 isLocalStorage(){
44 - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){  
45 - $('#myCenterBox').show();  
46 - }  
47 - }  
48 - _teacherBtnHandler(evt){  
49 - this._clearListContent();  
50 - this._showLoadingImg();  
51 - let _ele = $(evt.target);  
52 - if(_ele.attr('data')){  
53 - $('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');  
54 - }  
55 - $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');  
56 this.studentClickTeacher();//学生点击老师模块 39 this.studentClickTeacher();//学生点击老师模块
57 this.detailPage(); 40 this.detailPage();
58 } 41 }
@@ -60,7 +43,7 @@ class TeacherDetailApe extends Ape { @@ -60,7 +43,7 @@ class TeacherDetailApe extends Ape {
60 _pageNumBtnHandler(evt){ 43 _pageNumBtnHandler(evt){
61 loger.log('点击翻页') 44 loger.log('点击翻页')
62 let _ele = $(evt.target); 45 let _ele = $(evt.target);
63 - let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; 46 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUserByUserType';
64 let that = this; 47 let that = this;
65 if(_ele.siblings().length > 0 && _ele.text()!= '...' ){ 48 if(_ele.siblings().length > 0 && _ele.text()!= '...' ){
66 _ele.addClass('pageNumBtnCheck').siblings().removeClass('pageNumBtnCheck'); 49 _ele.addClass('pageNumBtnCheck').siblings().removeClass('pageNumBtnCheck');
@@ -72,15 +55,16 @@ class TeacherDetailApe extends Ape { @@ -72,15 +55,16 @@ class TeacherDetailApe extends Ape {
72 siteId:ClassDataProxy.siteId, 55 siteId:ClassDataProxy.siteId,
73 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo', 56 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo',
74 }, 57 },
75 - data:{siteId:ClassDataProxy.siteId}, 58 + data:{siteId:ClassDataProxy.siteId,userType : 1},
76 success:function(_data){ 59 success:function(_data){
77 loger.log('点击翻页返回数据',_data) 60 loger.log('点击翻页返回数据',_data)
78 if(_data != 200 ){ 61 if(_data != 200 ){
79 loger.warn(_data.returnData.data.msg) 62 loger.warn(_data.returnData.data.msg)
80 } 63 }
81 - that.classDateList = _data.returnData.data;  
82 - //切换列表内容  
83 - that._classDateContent(that.classDateList); 64 + if(_data && _data.code ==200){
  65 + //切换列表内容
  66 + that._classDateContent(_data.returnData.data);
  67 + }
84 }, 68 },
85 error:function(error){ 69 error:function(error){
86 //alert('老师翻页数据获取失败') 70 //alert('老师翻页数据获取失败')
@@ -93,7 +77,7 @@ class TeacherDetailApe extends Ape { @@ -93,7 +77,7 @@ class TeacherDetailApe extends Ape {
93 } 77 }
94 detailPage(){ 78 detailPage(){
95 let that = this; 79 let that = this;
96 - let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; 80 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/users/getUserByUserType';
97 $.ajax({ 81 $.ajax({
98 type: "POST", 82 type: "POST",
99 url: _url, 83 url: _url,
@@ -101,11 +85,11 @@ class TeacherDetailApe extends Ape { @@ -101,11 +85,11 @@ class TeacherDetailApe extends Ape {
101 headers: {siteId:ClassDataProxy.siteId, 85 headers: {siteId:ClassDataProxy.siteId,
102 userType : 1, 86 userType : 1,
103 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'}, 87 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
104 - data:{siteId:ClassDataProxy.siteId}, 88 + data:{siteId:ClassDataProxy.siteId,userType : 1},
105 success:function(_data){ 89 success:function(_data){
106 //获取课堂数据 90 //获取课堂数据
107 if(_data && _data.code == 200){ 91 if(_data && _data.code == 200){
108 - that._gainClassData(_data); 92 + that._gainClassData(_data.returnData.data);
109 } 93 }
110 94
111 }, 95 },
@@ -117,54 +101,48 @@ class TeacherDetailApe extends Ape { @@ -117,54 +101,48 @@ class TeacherDetailApe extends Ape {
117 }) 101 })
118 } 102 }
119 _gainClassDataErr(){ 103 _gainClassDataErr(){
120 - let classifyListContent = $('#classifyListContent');  
121 - classifyListContent.empty(); 104 + let teacherIntroContent = $('#teacherIntroContent');
  105 + teacherIntroContent.empty();
122 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>' 106 let _classifyList = '<div class="dataErrorTitle">数据获取失败～</div>'
123 - classifyListContent.append(_classifyList) 107 + teacherIntroContent.append(_classifyList)
124 } 108 }
125 //清除列表数据 109 //清除列表数据
126 _clearListContent(){ 110 _clearListContent(){
127 - let classifyListContent = $('#classifyListContent');  
128 - classifyListContent.empty();  
129 - let classifyListTitle = $('#classifyListTitle');  
130 - classifyListTitle.empty();  
131 - let pageNumContentBox = $('#pageNumContentBox');  
132 - pageNumContentBox.empty(); 111 + let teacherIntroContent = $('#teacherIntroContent');
  112 + teacherIntroContent.empty();
  113 + let teacherIntroPageBox = $('#teacherIntroPageBox');
  114 + teacherIntroPageBox.empty();
133 } 115 }
134 //列表显示loading 116 //列表显示loading
135 _showLoadingImg(){ 117 _showLoadingImg(){
136 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`; 118 let loadingImg = `<img class="loadingImg" src="images/loading.gif" alt="">`;
137 - $('#classifyListContent').append(loadingImg); 119 + $('#teacherIntroContent').append(loadingImg);
138 } 120 }
139 _gainClassData(_data){ 121 _gainClassData(_data){
140 - this.classDateList = _data.returnData.data;  
141 - this._clearListContent();  
142 - //切换列表分类的标题  
143 - this._classDateTitle();  
144 - //切换列表内容  
145 - this._classDateContent(this.classDateList);  
146 - //页码  
147 - this._classDatepageNum(this.classDateList);  
148 - }  
149 - _classDateTitle(){  
150 - $('#classifyListTitle').html($('#teacherTitle').html()); 122 + if(_data){
  123 + this._clearListContent();
  124 + //切换列表内容
  125 + this._classDateContent(_data);
  126 + //页码
  127 + this._classDatepageNum(_data);
  128 + }
151 } 129 }
152 _classDateContent(_data){ 130 _classDateContent(_data){
153 - let classifyListContent = $('#classifyListContent');  
154 - classifyListContent.empty();  
155 - let _dataList = _data.meetingInfo; 131 + let teacherIntroContent = $('#teacherIntroContent');
  132 + teacherIntroContent.empty();
  133 + let _dataList = _data.users;
156 for(let i = 0;i<_dataList.length;i++){ 134 for(let i = 0;i<_dataList.length;i++){
157 let j = (i%4)==3; 135 let j = (i%4)==3;
158 - let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) 136 + let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].create_time,_dataList[i].end_time)
159 let _classifyList = this._format(classifyList,{ 137 let _classifyList = this._format(classifyList,{
160 _classifyListR : j?'classifyListR':'', 138 _classifyListR : j?'classifyListR':'',
161 _id : _dataList[i].id, 139 _id : _dataList[i].id,
162 _msgImg :'../images/u373.png', 140 _msgImg :'../images/u373.png',
163 - _classroomTitle : _dataList[i].meetingName,  
164 - _schoolTime : _getTime,  
165 - _subscribeNum : '27人已预约' 141 + _classroomTitle : _dataList[i].user_name,
  142 + _schoolTime : _getTime.split('-')[0],
  143 + _subscribeNum :_dataList[i].reservationNumber+'人预约'
166 }) 144 })
167 - classifyListContent.append(_classifyList); 145 + teacherIntroContent.append(_classifyList);
168 } 146 }
169 } 147 }
170 _classDatepageNum(_data){ //page 148 _classDatepageNum(_data){ //page
@@ -174,27 +152,30 @@ class TeacherDetailApe extends Ape { @@ -174,27 +152,30 @@ class TeacherDetailApe extends Ape {
174 this.pagingConstruct(1,_pageNum); 152 this.pagingConstruct(1,_pageNum);
175 } 153 }
176 pagingConstruct(paging,total){ 154 pagingConstruct(paging,total){
177 - let pageNumContentBox = $('#pageNumContentBox');  
178 - pageNumContentBox.empty(); 155 + let teacherIntroPageBox = $('#teacherIntroPageBox');
  156 + teacherIntroPageBox.empty();
179 let pagingDivInnerHTML = '<div class="pageNumContent">'; 157 let pagingDivInnerHTML = '<div class="pageNumContent">';
180 let isHiddenExist = 0; 158 let isHiddenExist = 0;
181 - for(let i =1 ;i<=total;i++){  
182 - if(i == paging){  
183 - pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';  
184 - }else{  
185 - if (i < 4 || i < (paging + 4) && i > (paging - 2) && i < (total / 2 + 2) || i > (total - 2)) {  
186 - pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';  
187 - isHiddenExist = 0; 159 + if(total > 1){
  160 + for(let i =1 ;i<=total;i++){
  161 +
  162 + if(i == paging){
  163 + pagingDivInnerHTML +='<span class="pageNumBtn pageNumBtnCheck">'+i+'</span>';
188 }else{ 164 }else{
189 - if(isHiddenExist == 0){  
190 - pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';  
191 - isHiddenExist = 1; 165 + if (i < 4 || i < (paging + 3) && i > (paging - 2) || i > (total / 2 - 2) && i < (total / 2 + 2) || i > (total - 3)) {
  166 + pagingDivInnerHTML +='<span class="pageNumBtn">'+i+'</span>';
  167 + isHiddenExist = 0;
  168 + }else{
  169 + if(isHiddenExist == 0){
  170 + pagingDivInnerHTML += '<span class="pageNumBtn">...</span>';
  171 + isHiddenExist = 1;
  172 + }
192 } 173 }
193 } 174 }
194 } 175 }
195 } 176 }
196 pagingDivInnerHTML += '</div>'; 177 pagingDivInnerHTML += '</div>';
197 - pageNumContentBox.append(pagingDivInnerHTML); 178 + teacherIntroPageBox.append(pagingDivInnerHTML);
198 } 179 }
199 _teacherHome(){ 180 _teacherHome(){
200 $('#slideshow').hide(); 181 $('#slideshow').hide();
@@ -211,10 +192,14 @@ class TeacherDetailApe extends Ape { @@ -211,10 +192,14 @@ class TeacherDetailApe extends Ape {
211 $('#slideshow').hide(); 192 $('#slideshow').hide();
212 $('#defaultBox').hide(); 193 $('#defaultBox').hide();
213 $('.curriculumBox').hide(); 194 $('.curriculumBox').hide();
214 - $('#classifyListBox').show();  
215 $('#teacherDetailBox').hide(); 195 $('#teacherDetailBox').hide();
216 $('#lanclassBox').hide(); 196 $('#lanclassBox').hide();
217 $('#myCenterBox').hide(); 197 $('#myCenterBox').hide();
  198 +
  199 + $('#defaultBox').hide();
  200 + $('#liveContentAllBox').hide();
  201 + $('#lanclassAllBox').hide();
  202 + $('#teacherIntroAllBox').show();
218 } 203 }
219 204
220 //工具类 205 //工具类
@@ -26,6 +26,8 @@ import AdministratorApe from 'ape/AdministratorApe';//管理员 @@ -26,6 +26,8 @@ import AdministratorApe from 'ape/AdministratorApe';//管理员
26 import PlayRecordApe from 'ape/PlayRecordApe';//录制管理 26 import PlayRecordApe from 'ape/PlayRecordApe';//录制管理
27 import MyCenterApe from 'ape/MyCenterApe';//个人中心 27 import MyCenterApe from 'ape/MyCenterApe';//个人中心
28 import SubscribeApe from 'ape/SubscribeApe';//预约 28 import SubscribeApe from 'ape/SubscribeApe';//预约
  29 +import CollectApe from 'ape/CollectApe';//预约
  30 +
29 import MessageTypes from "MessageTypes"; 31 import MessageTypes from "MessageTypes";
30 32
31 33
@@ -49,6 +51,9 @@ let _administratorApe; @@ -49,6 +51,9 @@ let _administratorApe;
49 let _playRecordApe; 51 let _playRecordApe;
50 let _myCenterApe; 52 let _myCenterApe;
51 let _subscribeApe; 53 let _subscribeApe;
  54 +let _collectApe;
  55 +
  56 +let _headSwitchTitleApe;
52 57
53 class Main { 58 class Main {
54 constructor() { 59 constructor() {
@@ -143,6 +148,7 @@ class Main { @@ -143,6 +148,7 @@ class Main {
143 //首页 148 //首页
144 _homeApe = new HomeApe(); 149 _homeApe = new HomeApe();
145 _homeApe.on(MessageTypes.HOME_SKIP,this.homeSkip.bind(this)); 150 _homeApe.on(MessageTypes.HOME_SKIP,this.homeSkip.bind(this));
  151 + _homeApe.on(MessageTypes.SWITCH_HEADER,this.switchHeader.bind(this));
146 //老师 152 //老师
147 _teacherDetailApe = new TeacherDetailApe(); 153 _teacherDetailApe = new TeacherDetailApe();
148 //兼课 154 //兼课
@@ -170,7 +176,9 @@ class Main { @@ -170,7 +176,9 @@ class Main {
170 _myCenterApe = new MyCenterApe(); 176 _myCenterApe = new MyCenterApe();
171 //预约管理 177 //预约管理
172 _subscribeApe = new SubscribeApe(); 178 _subscribeApe = new SubscribeApe();
173 - 179 + _subscribeApe.on(MessageTypes.ORDER_FINISH,this.orderFinish.bind(this));
  180 + //收藏
  181 + _collectApe = new CollectApe();
174 } 182 }
175 183
176 184
@@ -246,10 +254,34 @@ class Main { @@ -246,10 +254,34 @@ class Main {
246 break; 254 break;
247 } 255 }
248 } 256 }
  257 + switchHeader(_data){
  258 + let ind = parseInt(_data);
  259 +
  260 + switch (ind){
  261 + case 0:
  262 + _homeApe.studentClick();
  263 + break;
  264 + case 1:
  265 + _liveClassApe.isLocalStorage();
  266 + break;
  267 + case 2:
  268 + _lanclassApe.isLocalStorage();
  269 + break;
  270 + case 3:
  271 + _teacherDetailApe.isLocalStorage();
  272 + break;
  273 + default:
  274 + return;
  275 + }
  276 + }
249 addClass(_data){ 277 addClass(_data){
250 loger.log('创建课堂成功') 278 loger.log('创建课堂成功')
251 _managementHomePageApe.detailPage(); 279 _managementHomePageApe.detailPage();
252 } 280 }
  281 + //预约成功重新渲染数据
  282 + orderFinish(){
  283 + _homeApe.homeAllDate();
  284 + }
253 //判断登录用户的状态 285 //判断登录用户的状态
254 _localStorageState(){ 286 _localStorageState(){
255 let userType = window.localStorage.getItem('userType')||0; 287 let userType = window.localStorage.getItem('userType')||0;
@@ -307,7 +339,9 @@ class Main { @@ -307,7 +339,9 @@ class Main {
307 $('#teacherDetailBox').hide(); 339 $('#teacherDetailBox').hide();
308 $('#myCenterBox').hide(); 340 $('#myCenterBox').hide();
309 $('#lanclassBox').hide(); 341 $('#lanclassBox').hide();
310 - $('#classifyListBox').hide(); 342 + $('#liveContentAllBox').hide();
  343 + $('#lanclassAllBox').hide();
  344 + $('#teacherIntroAllBox').hide();
311 $('#partTimeTeachingBox').hide(); 345 $('#partTimeTeachingBox').hide();
312 $('#recordUl .recordLi').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck'); 346 $('#recordUl .recordLi').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
313 $('.classManagementRight').eq(0).show().siblings().hide(); 347 $('.classManagementRight').eq(0).show().siblings().hide();
@@ -320,19 +354,24 @@ class Main { @@ -320,19 +354,24 @@ class Main {
320 $('#header_seek').hide(); 354 $('#header_seek').hide();
321 $('#androidDownload').hide(); 355 $('#androidDownload').hide();
322 $('#classManagementBox').hide(); 356 $('#classManagementBox').hide();
323 - $('#classifyListBox').hide();  
324 $('#partTimeTeachingBox').hide(); 357 $('#partTimeTeachingBox').hide();
325 $('#myCenterBox').show(); 358 $('#myCenterBox').show();
326 $('.myCenterContentBox').eq(0).show().siblings().hide(); 359 $('.myCenterContentBox').eq(0).show().siblings().hide();
327 $('#teacherMyCerter').show(); 360 $('#teacherMyCerter').show();
328 $('#studentMyCerter').hide(); 361 $('#studentMyCerter').hide();
329 $('.recordLi2').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck'); 362 $('.recordLi2').eq(0).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
  363 +
  364 + $('#liveContentAllBox').hide();
  365 + $('#lanclassAllBox').hide();
  366 + $('#teacherIntroAllBox').hide();
330 } 367 }
331 _student(){ 368 _student(){
332 $('#slideshow').show(); 369 $('#slideshow').show();
333 $('#defaultBox').show(); 370 $('#defaultBox').show();
334 $('.curriculumBox').show(); 371 $('.curriculumBox').show();
335 - $('#classifyListBox').hide(); 372 + $('#liveContentAllBox').hide();
  373 + $('#lanclassAllBox').hide();
  374 + $('#teacherIntroAllBox').hide();
336 $('#teacherDetailBox').hide(); 375 $('#teacherDetailBox').hide();
337 $('#lanclassBox').hide(); 376 $('#lanclassBox').hide();
338 $('#myCenterBox').hide(); 377 $('#myCenterBox').hide();
@@ -353,6 +392,9 @@ class Main { @@ -353,6 +392,9 @@ class Main {
353 $('#classifyListBox').hide(); 392 $('#classifyListBox').hide();
354 $('#myCenterBox').hide(); 393 $('#myCenterBox').hide();
355 $('#partTimeTeachingBox').show(); 394 $('#partTimeTeachingBox').show();
  395 + $('#liveContentAllBox').hide();
  396 + $('#lanclassAllBox').hide();
  397 + $('#teacherIntroAllBox').hide();
356 } 398 }
357 //获取国际化语言 399 //获取国际化语言
358 _localConfig() { 400 _localConfig() {
@@ -187,6 +187,54 @@ class ClassDataProxy { @@ -187,6 +187,54 @@ class ClassDataProxy {
187 return '已结束'; 187 return '已结束';
188 } 188 }
189 } 189 }
  190 + //计算时间戳倒计时
  191 + static getTimeCountDown(start){
  192 +
  193 + let newDate = Date.parse(new Date());
  194 + //开始时间
  195 + let newTime = Date.parse(new Date(start))
  196 +
  197 +
  198 + let t = newTime - newDate;
  199 + console.log(t)
  200 +
  201 + let hour=Math.floor(t/1000/60/60%24);
  202 + let min=Math.floor(t/1000/60%60);
  203 + let sec=Math.floor(t/1000%60);
  204 +
  205 + if (hour < 10) {
  206 + hour = "0" + hour;
  207 + }
  208 + if (min < 10) {
  209 + min = "0" + min;
  210 + }
  211 + if (sec < 10) {
  212 + sec = "0" + sec;
  213 + }
  214 +
  215 + if(t<0){
  216 + return '已结束';
  217 + }else{
  218 + return hour + ":" + min + ":" + sec;
  219 + }
  220 + }
  221 + //判断是否是今天
  222 + static getTimeDay(start){
  223 +
  224 + let newDate = new Date();
  225 + let month = newDate.getMonth()+1;
  226 + let day = newDate.getDate();
  227 +
  228 + let oldDate = new Date(start);
  229 + let d_month = oldDate.getMonth()+1;
  230 + let d_day = oldDate.getDate();
  231 +
  232 + if(month == d_month && day == d_day){
  233 + return true;
  234 + } else {
  235 + return false;
  236 + }
  237 + }
190 //计算时间差值显示列表 238 //计算时间差值显示列表
191 static getTimeDifference(start,end){ 239 static getTimeDifference(start,end){
192 let newTime = new Date(); 240 let newTime = new Date();
@@ -202,15 +250,15 @@ class ClassDataProxy { @@ -202,15 +250,15 @@ class ClassDataProxy {
202 let newDate = newStart.getDate();//日 250 let newDate = newStart.getDate();//日
203 251
204 let newEndHours = oldHours <10 ? '0' + oldHours : oldHours; 252 let newEndHours = oldHours <10 ? '0' + oldHours : oldHours;
205 - let newStartHours = newHours <10 ? '0' + newHours : newHours; 253 + let newStartHours = newHours < 10 ? '0' + newHours : newHours;
206 254
207 - let newStartDate = newStart.getDate()+1<10?'0'+newStart.getDate():newStart.getDate(); 255 + let newStartDate = (newStart.getDate()+1)<10?'0'+newStart.getDate():newStart.getDate();
208 let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay(); 256 let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay();
209 257
210 if(date == 0){ 258 if(date == 0){
211 return '今天 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00'; 259 return '今天 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00';
212 }else{ 260 }else{
213 - return newMonth + '月' + newDate +'日 ' + ' '+newHours + ':00' + ' - ' + oldHours+':00'; 261 + return newMonth + '月' + newDate +'日 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00';
214 } 262 }
215 } 263 }
216 } 264 }