正在显示
10 个修改的文件
包含
254 行增加
和
39 行删除
dist/images/icon-t.png
0 → 100644
254 字节
| @@ -946,9 +946,6 @@ body{ | @@ -946,9 +946,6 @@ body{ | ||
| 946 | .scheduleWire2{ | 946 | .scheduleWire2{ |
| 947 | width: 335px; | 947 | width: 335px; |
| 948 | } | 948 | } |
| 949 | -.scheduleWire2{ | ||
| 950 | - width: 510px; | ||
| 951 | -} | ||
| 952 | /*创建课堂第一步*/ | 949 | /*创建课堂第一步*/ |
| 953 | .form_item{ | 950 | .form_item{ |
| 954 | margin-bottom: 10px; | 951 | margin-bottom: 10px; |
| @@ -1103,7 +1100,6 @@ body{ | @@ -1103,7 +1100,6 @@ body{ | ||
| 1103 | } | 1100 | } |
| 1104 | .createClassLegendConfig{ | 1101 | .createClassLegendConfig{ |
| 1105 | padding-right: 530px; | 1102 | padding-right: 530px; |
| 1106 | - background: transparent url(../images/icon-.png) right no-repeat; | ||
| 1107 | color: #61719a; | 1103 | color: #61719a; |
| 1108 | } | 1104 | } |
| 1109 | .allowPublicDetail + label{ | 1105 | .allowPublicDetail + label{ |
| @@ -1121,6 +1117,7 @@ body{ | @@ -1121,6 +1117,7 @@ body{ | ||
| 1121 | } | 1117 | } |
| 1122 | .classConfig_details{ | 1118 | .classConfig_details{ |
| 1123 | padding-top:10px; | 1119 | padding-top:10px; |
| 1120 | + display: none; | ||
| 1124 | } | 1121 | } |
| 1125 | /*底部*/ | 1122 | /*底部*/ |
| 1126 | .footerBg{ | 1123 | .footerBg{ |
| @@ -1388,6 +1385,7 @@ body{ | @@ -1388,6 +1385,7 @@ body{ | ||
| 1388 | width:200px; | 1385 | width:200px; |
| 1389 | height:270px; | 1386 | height:270px; |
| 1390 | background: #fff; | 1387 | background: #fff; |
| 1388 | + float: left; | ||
| 1391 | } | 1389 | } |
| 1392 | .recordLi2{ | 1390 | .recordLi2{ |
| 1393 | width: 60%; | 1391 | width: 60%; |
| @@ -1402,9 +1400,134 @@ body{ | @@ -1402,9 +1400,134 @@ body{ | ||
| 1402 | width:330px; | 1400 | width:330px; |
| 1403 | height:180px; | 1401 | height:180px; |
| 1404 | background: #fff; | 1402 | background: #fff; |
| 1403 | + float: left; | ||
| 1404 | + font-size: 14px; | ||
| 1405 | + color: #333333; | ||
| 1406 | + margin:0 15px; | ||
| 1407 | +} | ||
| 1408 | +.teacherMyCenter1{ | ||
| 1409 | + padding:30px 0 15px 30px; | ||
| 1410 | + float: left; | ||
| 1411 | +} | ||
| 1412 | +.teacherMyCenterImg{ | ||
| 1413 | + width:50px; | ||
| 1414 | + height:50px; | ||
| 1415 | + float: left; | ||
| 1416 | +} | ||
| 1417 | +.teacherMyCenterInfoBox{ | ||
| 1418 | + float: left; | ||
| 1419 | + padding-left:30px; | ||
| 1420 | +} | ||
| 1421 | +.teacherMyCenterInfo{ | ||
| 1422 | + float: left; | ||
| 1423 | + width: 100%; | ||
| 1424 | +} | ||
| 1425 | +.teacherMyCenter2{ | ||
| 1426 | + float: left; | ||
| 1427 | + width: 100%; | ||
| 1428 | + padding-top:12px; | ||
| 1429 | + padding-left:30px; | ||
| 1430 | +} | ||
| 1431 | +.teacherMyCenterTitle{ | ||
| 1432 | + float: left; | ||
| 1433 | +} | ||
| 1434 | +.teacherGradeImgBox{ | ||
| 1435 | + | ||
| 1436 | +} | ||
| 1437 | +.teacherGradeImg{ | ||
| 1438 | + width:16px; | ||
| 1439 | + height:16px; | ||
| 1440 | + display: inline-block; | ||
| 1405 | } | 1441 | } |
| 1406 | .myCenterTopRightBox{ | 1442 | .myCenterTopRightBox{ |
| 1407 | - width:640px; | ||
| 1408 | - height:180px; | 1443 | + width: 600px; |
| 1444 | + height: 140px; | ||
| 1445 | + background: #fff; | ||
| 1446 | + padding: 20px; | ||
| 1447 | + float: left; | ||
| 1448 | +} | ||
| 1449 | +.myCenterTopRightTit{ | ||
| 1450 | + font-size: 16px; | ||
| 1451 | + color: #333333; | ||
| 1452 | + padding-bottom:20px; | ||
| 1453 | +} | ||
| 1454 | +.teacherTodayCourseList{ | ||
| 1455 | + font-size: 12px; | ||
| 1456 | + color:#333333; | ||
| 1457 | + float: left; | ||
| 1458 | + width: 100%; | ||
| 1459 | +} | ||
| 1460 | +.teacherStartContent{ | ||
| 1461 | + color:#d95136; | ||
| 1462 | +} | ||
| 1463 | +.courseDetailInfo{ | ||
| 1464 | + float: left; | ||
| 1465 | + line-height: 28px; | ||
| 1466 | + padding:5px 0; | ||
| 1467 | +} | ||
| 1468 | +.courseDetailInfo1{ | ||
| 1469 | + line-height: 28px; | ||
| 1470 | + padding:5px 0 5px 125px; | ||
| 1471 | +} | ||
| 1472 | +.teacherEnterClass{ | ||
| 1473 | + height: 28px; | ||
| 1474 | + width: 70px; | ||
| 1475 | + border-radius: 3px; | ||
| 1476 | + background: #3498db; | ||
| 1477 | + font-size: 12px; | ||
| 1478 | + color:#fff; | ||
| 1479 | + display: inline-block; | ||
| 1480 | + border:none; | ||
| 1481 | + float: right; | ||
| 1482 | +} | ||
| 1483 | +.myCenterContentTitleBox{ | ||
| 1484 | + width:985px; | ||
| 1485 | + height:44px; | ||
| 1486 | + line-height: 44px; | ||
| 1487 | + margin:15px 0 15px 15px; | ||
| 1488 | + background: #fff; | ||
| 1489 | + font-size: 12px; | ||
| 1490 | + color:#666666; | ||
| 1491 | + float: left; | ||
| 1492 | +} | ||
| 1493 | +.myCenterContentList{ | ||
| 1494 | + width:985px; | ||
| 1495 | + float: left; | ||
| 1496 | + margin-left:15px; | ||
| 1497 | +} | ||
| 1498 | +.classifyListMyCenter{ | ||
| 1499 | + width: 235px; | ||
| 1500 | + height: 232px; | ||
| 1501 | + float: left; | ||
| 1409 | background: #fff; | 1502 | background: #fff; |
| 1503 | + margin-right: 25px; | ||
| 1504 | + cursor: pointer; | ||
| 1505 | +} | ||
| 1506 | +.classifyListMyCenter:hover{ | ||
| 1507 | + box-shadow: 1px 5px 15px #adadad; | ||
| 1508 | +} | ||
| 1509 | +.myCenterContentListImg{ | ||
| 1510 | + width: 235px; | ||
| 1511 | + height:138px; | ||
| 1512 | +} | ||
| 1513 | +.myCenterContentListTit{ | ||
| 1514 | + font-size: 14px; | ||
| 1515 | + color: #333333; | ||
| 1516 | + padding:8px 5px 0 5px; | ||
| 1517 | +} | ||
| 1518 | +.myCenterContentListTit1{ | ||
| 1519 | + padding:5px 5px 0 5px; | ||
| 1520 | + font-size: 12px; | ||
| 1521 | + color: #333333; | ||
| 1522 | +} | ||
| 1523 | +.myCenterContentMin{ | ||
| 1524 | + color:#999999; | ||
| 1525 | + font-size: 12px; | ||
| 1526 | + padding:12px 5px 0 5px; | ||
| 1527 | +} | ||
| 1528 | +.myCenterContentTimer{ | ||
| 1529 | + float: right; | ||
| 1530 | + color:#999999; | ||
| 1531 | + font-size: 12px; | ||
| 1532 | + padding-right: 5px; | ||
| 1410 | } | 1533 | } |
| @@ -824,10 +824,11 @@ | @@ -824,10 +824,11 @@ | ||
| 824 | </div> | 824 | </div> |
| 825 | </div> | 825 | </div> |
| 826 | <div class="createClassMoreOptionBox"> | 826 | <div class="createClassMoreOptionBox"> |
| 827 | - <p class="createClassLegend"> | ||
| 828 | - <span class="createClassLegendConfig">更多参数</span> | 827 | + <p class="createClassLegend" id="openParamBtn"> |
| 828 | + <span class="createClassLegendConfig" id="createClassLegendConfig">更多参数</span> | ||
| 829 | + <img id="createClassLegendImg" src="images/icon-.png" alt=""> | ||
| 829 | </p> | 830 | </p> |
| 830 | - <div class="classConfig_details"> | 831 | + <div class="classConfig_details" id="classConfig_details"> |
| 831 | <div style="width:100%;float:left;"> | 832 | <div style="width:100%;float:left;"> |
| 832 | <div class="form_item form_item1"> | 833 | <div class="form_item form_item1"> |
| 833 | <label class="step_page1Title step_page1Title2"> | 834 | <label class="step_page1Title step_page1Title2"> |
| @@ -968,17 +969,73 @@ | @@ -968,17 +969,73 @@ | ||
| 968 | </ul> | 969 | </ul> |
| 969 | </div> | 970 | </div> |
| 970 | <div class="myCenterContentBox"> | 971 | <div class="myCenterContentBox"> |
| 971 | - <div class="myCenterTopLeftBox"></div> | ||
| 972 | - <div class="myCenterTopRightBox"></div> | ||
| 973 | - <div class="myCenterContentTitle"> | 972 | + <div class="myCenterTopLeftBox"> |
| 973 | + <div class="teacherMyCenter1"> | ||
| 974 | + <img class="teacherMyCenterImg" src="images/u373.png" alt=""> | ||
| 975 | + <p class="teacherMyCenterInfoBox"> | ||
| 976 | + <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span> | ||
| 977 | + <span class="teacherMyCenterInfo" id="teacherMyCenterName">小明同学</span> | ||
| 978 | + </p> | ||
| 979 | + </div> | ||
| 980 | + <div class="teacherMyCenter2"> | ||
| 981 | + <label class="teacherMyCenterTitle">学习时长:</label> | ||
| 982 | + <span class="learningTime">20小时08分钟</span> | ||
| 983 | + </div> | ||
| 984 | + <div class="teacherMyCenter2"> | ||
| 985 | + <label class="teacherMyCenterTitle">安全等级:</label> | ||
| 986 | + <div class="teacherGradeImgBox"> | ||
| 987 | + <img class="teacherGradeImg" src="images/not-collect.png" alt=""> | ||
| 988 | + <img class="teacherGradeImg" src="images/not-collect.png" alt=""> | ||
| 989 | + <img class="teacherGradeImg" src="images/not-collect.png" alt=""> | ||
| 990 | + <img class="teacherGradeImg" src="images/not-collect.png" alt=""> | ||
| 991 | + <img class="teacherGradeImg" src="images/not-collect.png" alt=""> | ||
| 992 | + </div> | ||
| 993 | + </div> | ||
| 994 | + </div> | ||
| 995 | + <div class="myCenterTopRightBox"> | ||
| 996 | + <label class="myCenterTopRightTit">今日课程</label> | ||
| 997 | + <ul> | ||
| 998 | + <li class="teacherTodayCourseList"> | ||
| 999 | + <span class="courseDetailInfo">《初中英语(上)》</span> | ||
| 1000 | + <span class="courseDetailInfo1">距开始还有:<i class="teacherStartContent">00:09:10</i></span> | ||
| 1001 | + <button class="teacherEnterClass btnHover">立即进入</button> | ||
| 1002 | + </li> | ||
| 1003 | + <li class="teacherTodayCourseList"> | ||
| 1004 | + <span class="courseDetailInfo">《初中英语(上)》</span> | ||
| 1005 | + <span class="courseDetailInfo1">距开始还有:<i class="teacherStartContent">00:09:10</i></span> | ||
| 1006 | + <button class="teacherEnterClass btnHover">立即进入</button> | ||
| 1007 | + </li> | ||
| 1008 | + </ul> | ||
| 1009 | + </div> | ||
| 1010 | + <div class="myCenterContentTitleBox"> | ||
| 974 | <div class="liveInfoLeft" id="teacherInfoList"> | 1011 | <div class="liveInfoLeft" id="teacherInfoList"> |
| 975 | <div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div> | 1012 | <div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div> |
| 976 | <div class="liveInfoLeftLi">未开始</div> | 1013 | <div class="liveInfoLeftLi">未开始</div> |
| 977 | <div class="liveInfoLeftLi">已结束</div> | 1014 | <div class="liveInfoLeftLi">已结束</div> |
| 978 | </div> | 1015 | </div> |
| 979 | </div> | 1016 | </div> |
| 980 | - <div class="myCenterContent"> | ||
| 981 | - | 1017 | + <div class="myCenterContentList"> |
| 1018 | + <div class="classifyListMyCenter"> | ||
| 1019 | + <img class="myCenterContentListImg" src="images/u373.png" alt=""> | ||
| 1020 | + <p class="myCenterContentListTit">初一英语阅读理解习题课</p> | ||
| 1021 | + <p class="myCenterContentListTit1">主讲人:方圆</p> | ||
| 1022 | + <p class="myCenterContentMin">45min</p> | ||
| 1023 | + <span class="myCenterContentTimer">2016-09-12</span> | ||
| 1024 | + </div> | ||
| 1025 | + <div class="classifyListMyCenter"> | ||
| 1026 | + <img class="myCenterContentListImg" src="images/u373.png" alt=""> | ||
| 1027 | + <p class="myCenterContentListTit">初一英语阅读理解习题课</p> | ||
| 1028 | + <p class="myCenterContentListTit1">主讲人:方圆</p> | ||
| 1029 | + <p class="myCenterContentMin">45min</p> | ||
| 1030 | + <span class="myCenterContentTimer">2016-09-12</span> | ||
| 1031 | + </div> | ||
| 1032 | + <div class="classifyListMyCenter"> | ||
| 1033 | + <img class="myCenterContentListImg" src="images/u373.png" alt=""> | ||
| 1034 | + <p class="myCenterContentListTit">初一英语阅读理解习题课</p> | ||
| 1035 | + <p class="myCenterContentListTit1">主讲人:方圆</p> | ||
| 1036 | + <p class="myCenterContentMin">45min</p> | ||
| 1037 | + <span class="myCenterContentTimer">2016-09-12</span> | ||
| 1038 | + </div> | ||
| 982 | </div> | 1039 | </div> |
| 983 | </div> | 1040 | </div> |
| 984 | </div> | 1041 | </div> |
| @@ -12,7 +12,6 @@ MessageTypes.LOGIN_IN= "login_in"; //更新用户退出 | @@ -12,7 +12,6 @@ MessageTypes.LOGIN_IN= "login_in"; //更新用户退出 | ||
| 12 | 12 | ||
| 13 | //header按钮 | 13 | //header按钮 |
| 14 | MessageTypes.HOME_SKIP= "home_skip"; //首页跳转 | 14 | MessageTypes.HOME_SKIP= "home_skip"; //首页跳转 |
| 15 | -MessageTypes.TEACHER_SKIP= "teacher_skip"; //老师跳转 | ||
| 16 | 15 | ||
| 17 | 16 | ||
| 18 | 17 |
| @@ -38,6 +38,8 @@ class CreateClassApe extends Ape { | @@ -38,6 +38,8 @@ class CreateClassApe extends Ape { | ||
| 38 | $('#createClassUpTwo').on('click',this._createClassUpTwoHandler.bind(this));//创建课堂第二步 | 38 | $('#createClassUpTwo').on('click',this._createClassUpTwoHandler.bind(this));//创建课堂第二步 |
| 39 | 39 | ||
| 40 | $('#createClassSubmit3').on('click',this._createClassSubmit3Handler.bind(this));//创建课堂第三步 | 40 | $('#createClassSubmit3').on('click',this._createClassSubmit3Handler.bind(this));//创建课堂第三步 |
| 41 | + | ||
| 42 | + $('#openParamBtn').on('click',this._openParamBtnHandler.bind(this));//打开更多参数 | ||
| 41 | //日历插件 | 43 | //日历插件 |
| 42 | this._dateUI(); | 44 | this._dateUI(); |
| 43 | } | 45 | } |
| @@ -163,6 +165,7 @@ class CreateClassApe extends Ape { | @@ -163,6 +165,7 @@ class CreateClassApe extends Ape { | ||
| 163 | _createClassUpTwoHandler(){ | 165 | _createClassUpTwoHandler(){ |
| 164 | $('#scheduleForm2').show(); | 166 | $('#scheduleForm2').show(); |
| 165 | $('#scheduleForm3').hide(); | 167 | $('#scheduleForm3').hide(); |
| 168 | + $('#classConfig_details').hide(); | ||
| 166 | } | 169 | } |
| 167 | _createClassSubmit3Handler(){ | 170 | _createClassSubmit3Handler(){ |
| 168 | let chatInterval = $('#chatInterval').val(); | 171 | let chatInterval = $('#chatInterval').val(); |
| @@ -189,6 +192,18 @@ class CreateClassApe extends Ape { | @@ -189,6 +192,18 @@ class CreateClassApe extends Ape { | ||
| 189 | //清空创建信息界面 | 192 | //清空创建信息界面 |
| 190 | this._closeCreateClass(); | 193 | this._closeCreateClass(); |
| 191 | } | 194 | } |
| 195 | + //打开更多参数 | ||
| 196 | + _openParamBtnHandler(){ | ||
| 197 | + let classConfig_details = $('#classConfig_details'); | ||
| 198 | + let createClassLegendImg = $('#createClassLegendImg'); | ||
| 199 | + if(classConfig_details.is(':hidden')){ | ||
| 200 | + classConfig_details.show(); | ||
| 201 | + createClassLegendImg.attr('src','images/icon-t.png'); | ||
| 202 | + }else{ | ||
| 203 | + classConfig_details.hide(); | ||
| 204 | + createClassLegendImg.attr('src','images/icon-.png'); | ||
| 205 | + } | ||
| 206 | + } | ||
| 192 | detailClass(){ | 207 | detailClass(){ |
| 193 | let dateList = this.classDateList; | 208 | let dateList = this.classDateList; |
| 194 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting'; | 209 | let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting'; |
| @@ -16,7 +16,14 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> | @@ -16,7 +16,14 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> | ||
| 16 | </p> | 16 | </p> |
| 17 | </div>`; | 17 | </div>`; |
| 18 | 18 | ||
| 19 | - | 19 | +const teacherList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}"> |
| 20 | + <img class="curriculumListImg" src="{_msgImg}" alt=""> | ||
| 21 | + <p class="curriculumListTit">{_classroomTitle}</p> | ||
| 22 | + <p class="curriculumListInfo"> | ||
| 23 | + <span class="curriculumListTime">{_schoolTime}</span> | ||
| 24 | + <span class="curriculumListNum">{_subscribeNum}</span> | ||
| 25 | + </p> | ||
| 26 | + </div>`; | ||
| 20 | let loger = Loger.getLoger('PC-HomeApe'); | 27 | let loger = Loger.getLoger('PC-HomeApe'); |
| 21 | class HomeApe extends Ape { | 28 | class HomeApe extends Ape { |
| 22 | constructor() { | 29 | constructor() { |
| @@ -55,11 +62,7 @@ class HomeApe extends Ape { | @@ -55,11 +62,7 @@ class HomeApe extends Ape { | ||
| 55 | _lanclassBtnHandler(evt){ | 62 | _lanclassBtnHandler(evt){ |
| 56 | loger.log('首页',ClassDataProxy.userType) | 63 | loger.log('首页',ClassDataProxy.userType) |
| 57 | $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); | 64 | $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); |
| 58 | - if( ClassDataProxy.userType== ClassDataProxy.USER_TYPE_8 || ClassDataProxy.userType== ClassDataProxy.USER_TYPE_0){ | ||
| 59 | this.studentClick(); | 65 | this.studentClick(); |
| 60 | - }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | ||
| 61 | - this._emit(MessageTypes.HOME_SKIP,{userType:ClassDataProxy.userType}); | ||
| 62 | - } | ||
| 63 | } | 66 | } |
| 64 | detailPage(){ | 67 | detailPage(){ |
| 65 | let that = this; | 68 | let that = this; |
| @@ -139,10 +142,24 @@ class HomeApe extends Ape { | @@ -139,10 +142,24 @@ class HomeApe extends Ape { | ||
| 139 | _msgImg :'../images/u373.png', | 142 | _msgImg :'../images/u373.png', |
| 140 | _classroomTitle : _dataList[i].meetingName, | 143 | _classroomTitle : _dataList[i].meetingName, |
| 141 | _schoolTime : _getTime, | 144 | _schoolTime : _getTime, |
| 142 | - _subscribeNum : _dataList[i].reservationNumber+'人已预约' | 145 | + _subscribeNum : '12人已预约' |
| 143 | }) | 146 | }) |
| 144 | liveList.append(_classifyList); | 147 | liveList.append(_classifyList); |
| 145 | lanclassList.append(_classifyList); | 148 | lanclassList.append(_classifyList); |
| 149 | + } | ||
| 150 | + } | ||
| 151 | + for(let i = 0;i<_dataList.length;i++){ | ||
| 152 | + if(i<8){ | ||
| 153 | + let j = (i%4)==3; | ||
| 154 | + let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) | ||
| 155 | + let _classifyList = this._format(teacherList,{ | ||
| 156 | + _classifyListR : j?'classifyListR':'', | ||
| 157 | + _id : _dataList[i].id, | ||
| 158 | + _msgImg :'../images/u373.png', | ||
| 159 | + _classroomTitle : _dataList[i].meetingName, | ||
| 160 | + _schoolTime : _getTime, | ||
| 161 | + _subscribeNum : '34人已预约' | ||
| 162 | + }) | ||
| 146 | teacherIntro.append(_classifyList); | 163 | teacherIntro.append(_classifyList); |
| 147 | } | 164 | } |
| 148 | } | 165 | } |
| @@ -12,6 +12,7 @@ class ListDetailsApe extends Ape { | @@ -12,6 +12,7 @@ class ListDetailsApe extends Ape { | ||
| 12 | constructor() { | 12 | constructor() { |
| 13 | super(); | 13 | super(); |
| 14 | this.addEvent(); | 14 | this.addEvent(); |
| 15 | + this.isDate = 0; | ||
| 15 | this.init(); | 16 | this.init(); |
| 16 | } | 17 | } |
| 17 | 18 | ||
| @@ -27,6 +28,8 @@ class ListDetailsApe extends Ape { | @@ -27,6 +28,8 @@ class ListDetailsApe extends Ape { | ||
| 27 | _curriculumListHandler(evt){ | 28 | _curriculumListHandler(evt){ |
| 28 | $('#slideshow').hide(); | 29 | $('#slideshow').hide(); |
| 29 | let _id = evt.currentTarget.id; | 30 | let _id = evt.currentTarget.id; |
| 31 | + let isDate = $(evt.currentTarget).attr('data'); | ||
| 32 | + this.isDate = isDate; | ||
| 30 | this.detailPage(_id); | 33 | this.detailPage(_id); |
| 31 | } | 34 | } |
| 32 | _collectYesHandler(){ | 35 | _collectYesHandler(){ |
| @@ -70,14 +73,10 @@ class ListDetailsApe extends Ape { | @@ -70,14 +73,10 @@ class ListDetailsApe extends Ape { | ||
| 70 | } | 73 | } |
| 71 | _classDateContent(_data){ | 74 | _classDateContent(_data){ |
| 72 | let _dataList = _data.meetingInfo[0]; | 75 | let _dataList = _data.meetingInfo[0]; |
| 73 | - if(_dataList.meetingType == 1){ | ||
| 74 | - loger.log('互动课堂') | 76 | + if(this.isDate){ |
| 75 | this._lanclassRender(_dataList); | 77 | this._lanclassRender(_dataList); |
| 76 | - }else if(_dataList.meetingType == 2){ | ||
| 77 | - loger.log('直播课堂') | ||
| 78 | - this._liveRender(_dataList); | ||
| 79 | }else{ | 78 | }else{ |
| 80 | - this._lanclassRender(_dataList); | 79 | + this._liveRender(_dataList); |
| 81 | } | 80 | } |
| 82 | $('#classifyListBox').hide(); | 81 | $('#classifyListBox').hide(); |
| 83 | } | 82 | } |
| @@ -289,7 +289,7 @@ class LoginOrRegister extends Ape { | @@ -289,7 +289,7 @@ class LoginOrRegister extends Ape { | ||
| 289 | success:function(_data){ | 289 | success:function(_data){ |
| 290 | loger.log('登录返回数据',_data) | 290 | loger.log('登录返回数据',_data) |
| 291 | if(_data || _data.code == 200){ | 291 | if(_data || _data.code == 200){ |
| 292 | - ClassDataProxy.userType = ClassDataProxy.USER_TYPE_2; | 292 | + ClassDataProxy.userType = ClassDataProxy.USER_TYPE_1; |
| 293 | //ClassDataProxy.userType= _data.returnData.data.userType; | 293 | //ClassDataProxy.userType= _data.returnData.data.userType; |
| 294 | ClassDataProxy.loginName =_name.value; | 294 | ClassDataProxy.loginName =_name.value; |
| 295 | ClassDataProxy.password = _passWord.value; | 295 | ClassDataProxy.password = _passWord.value; |
| @@ -11,7 +11,7 @@ import ClassDataProxy from "proxy/ClassDataProxy"; | @@ -11,7 +11,7 @@ import ClassDataProxy from "proxy/ClassDataProxy"; | ||
| 11 | 11 | ||
| 12 | let loger = Loger.getLoger('PC-TeacherDetailApe'); | 12 | let loger = Loger.getLoger('PC-TeacherDetailApe'); |
| 13 | 13 | ||
| 14 | -const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}"> | 14 | +const classifyList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}"> |
| 15 | <img class="curriculumListImg" src="{_msgImg}" alt=""> | 15 | <img class="curriculumListImg" src="{_msgImg}" alt=""> |
| 16 | <p class="curriculumListTit">{_classroomTitle}</p> | 16 | <p class="curriculumListTit">{_classroomTitle}</p> |
| 17 | <p class="curriculumListInfo"> | 17 | <p class="curriculumListInfo"> |
| @@ -24,6 +24,7 @@ class TeacherDetailApe extends Ape { | @@ -24,6 +24,7 @@ class TeacherDetailApe extends Ape { | ||
| 24 | constructor() { | 24 | constructor() { |
| 25 | super(); | 25 | super(); |
| 26 | this.classDateList = {};//课堂的所有数据 | 26 | this.classDateList = {};//课堂的所有数据 |
| 27 | + this.isLocalStorage(); | ||
| 27 | this.addEvent(); | 28 | this.addEvent(); |
| 28 | this.init(); | 29 | this.init(); |
| 29 | } | 30 | } |
| @@ -42,6 +43,11 @@ class TeacherDetailApe extends Ape { | @@ -42,6 +43,11 @@ class TeacherDetailApe extends Ape { | ||
| 42 | addEvent() { | 43 | addEvent() { |
| 43 | 44 | ||
| 44 | } | 45 | } |
| 46 | + isLocalStorage(){ | ||
| 47 | + if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | ||
| 48 | + $('#myCenterBox').show(); | ||
| 49 | + } | ||
| 50 | + } | ||
| 45 | _teacherBtnHandler(evt){ | 51 | _teacherBtnHandler(evt){ |
| 46 | loger.log('老师',ClassDataProxy.userType) | 52 | loger.log('老师',ClassDataProxy.userType) |
| 47 | this._clearListContent(); | 53 | this._clearListContent(); |
| @@ -159,7 +165,7 @@ class TeacherDetailApe extends Ape { | @@ -159,7 +165,7 @@ class TeacherDetailApe extends Ape { | ||
| 159 | _msgImg :'../images/u373.png', | 165 | _msgImg :'../images/u373.png', |
| 160 | _classroomTitle : _dataList[i].meetingName, | 166 | _classroomTitle : _dataList[i].meetingName, |
| 161 | _schoolTime : _getTime, | 167 | _schoolTime : _getTime, |
| 162 | - _subscribeNum : _dataList[i].reservationNumber+'人已预约' | 168 | + _subscribeNum : '27人已预约' |
| 163 | }) | 169 | }) |
| 164 | classifyListContent.append(_classifyList); | 170 | classifyListContent.append(_classifyList); |
| 165 | } | 171 | } |
| @@ -35,7 +35,7 @@ let _myCenterApe; | @@ -35,7 +35,7 @@ let _myCenterApe; | ||
| 35 | 35 | ||
| 36 | class Main { | 36 | class Main { |
| 37 | constructor() { | 37 | constructor() { |
| 38 | - this.clientVersion="v1.5.3.20170903"; | 38 | + this.clientVersion="v1.5.4.20170903"; |
| 39 | loger.warn("clientVersion:"+this.clientVersion); | 39 | loger.warn("clientVersion:"+this.clientVersion); |
| 40 | 40 | ||
| 41 | let locationProtocol= location.protocol; | 41 | let locationProtocol= location.protocol; |
| @@ -164,14 +164,13 @@ class Main { | @@ -164,14 +164,13 @@ class Main { | ||
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | - homeSkip(_data){ | ||
| 168 | - if(_data && _data.userType){ | ||
| 169 | - if(_data.userType == ClassDataProxy.USER_TYPE_1){ | 167 | + homeSkip(_data) { |
| 168 | + if (_data && _data.userType) { | ||
| 169 | + if (_data.userType == ClassDataProxy.USER_TYPE_1) { | ||
| 170 | _teacherDetailApe.detailPage(); | 170 | _teacherDetailApe.detailPage(); |
| 171 | } | 171 | } |
| 172 | } | 172 | } |
| 173 | } | 173 | } |
| 174 | - | ||
| 175 | //判断登录用户的状态 | 174 | //判断登录用户的状态 |
| 176 | _localStorageState(){ | 175 | _localStorageState(){ |
| 177 | let userType = window.localStorage.getItem('userType')||0; | 176 | let userType = window.localStorage.getItem('userType')||0; |
| @@ -213,11 +212,11 @@ class Main { | @@ -213,11 +212,11 @@ class Main { | ||
| 213 | $('#slideshow').hide(); | 212 | $('#slideshow').hide(); |
| 214 | $('#defaultBox').hide(); | 213 | $('#defaultBox').hide(); |
| 215 | $('.curriculumBox').hide(); | 214 | $('.curriculumBox').hide(); |
| 216 | - $('#header_list').show(); | ||
| 217 | - $('#header_seek').show(); | ||
| 218 | - $('#androidDownload').show(); | 215 | + $('#header_list').hide(); |
| 216 | + $('#header_seek').hide(); | ||
| 217 | + $('#androidDownload').hide(); | ||
| 219 | $('#classManagementBox').hide(); | 218 | $('#classManagementBox').hide(); |
| 220 | - $('#classifyListBox').show(); | 219 | + $('#classifyListBox').hide(); |
| 221 | } | 220 | } |
| 222 | _student(){ | 221 | _student(){ |
| 223 | $('#slideshow').show(); | 222 | $('#slideshow').show(); |
-
请 注册 或 登录 后发表评论