董佳音 / networkSchool

转到一个项目
Toggle navigation Toggle navigation pinning
董佳音
b1194655 1 parent fa3e9c6d

修改老师端显示，首页显示时间问题

内嵌 并排对比
正在显示 14 个修改的文件 包含 580 行增加 和 404 行删除
@@ -273,7 +273,7 @@ body{ @@ -273,7 +273,7 @@ body{
273 left:0; 273 left:0;
274 right:0; 274 right:0;
275 margin:0 auto; 275 margin:0 auto;
276 - min-height:600px; 276 + min-height:580px;
277 } 277 }
278 /*首页*/ 278 /*首页*/
279 .box{ 279 .box{
@@ -722,6 +722,7 @@ body{ @@ -722,6 +722,7 @@ body{
722 } 722 }
723 .liveInfoLeft{ 723 .liveInfoLeft{
724 float: left; 724 float: left;
  725 + padding-left:15px;
725 } 726 }
726 .liveInfoLeftLi{ 727 .liveInfoLeftLi{
727 float: left; 728 float: left;
@@ -729,6 +730,7 @@ body{ @@ -729,6 +730,7 @@ body{
729 text-align: center; 730 text-align: center;
730 padding:0 10px; 731 padding:0 10px;
731 font-size: 14px; 732 font-size: 14px;
  733 + margin-right:15px;
732 cursor: pointer; 734 cursor: pointer;
733 } 735 }
734 .liveInfoLeftLi:hover{ 736 .liveInfoLeftLi:hover{
@@ -1374,11 +1376,41 @@ body{ @@ -1374,11 +1376,41 @@ body{
1374 .removeCancel{ 1376 .removeCancel{
1375 background: #e6e6e6; 1377 background: #e6e6e6;
1376 } 1378 }
  1379 +/* warn警告框 */
  1380 +.warnHintBox{
  1381 + width:300px;
  1382 + height:120px;
  1383 + position: absolute;
  1384 + left: 0;
  1385 + right: 0;
  1386 + top: 0;
  1387 + bottom: 0;
  1388 + margin: auto;
  1389 + background: #fffdfd;
  1390 + cursor: default;
  1391 + font-size: 14px;
  1392 + border-radius:4px;
  1393 + box-shadow: 1px 3px 6px #adadad;
  1394 + border: 1px solid #c1baba;
  1395 + display: none;
  1396 +}
  1397 +.warnHintA{
  1398 + position: absolute;
  1399 + right:8px;
  1400 + top:6px;
  1401 +}
  1402 +.warnHintContent{
  1403 + width:100%;
  1404 + height:120px;
  1405 + line-height: 120px;
  1406 + text-align: center;
  1407 +}
  1408 +/* warn警告框 END */
1377 /*个人中心*/ 1409 /*个人中心*/
1378 .myCenterBox{ 1410 .myCenterBox{
1379 width:100%; 1411 width:100%;
1380 float: left; 1412 float: left;
1381 - margin:40px 15px 0 40px; 1413 + margin-top:40px;
1382 display: none; 1414 display: none;
1383 } 1415 }
1384 .myCenterLeftBox{ 1416 .myCenterLeftBox{
@@ -1386,6 +1418,7 @@ body{ @@ -1386,6 +1418,7 @@ body{
1386 height:270px; 1418 height:270px;
1387 background: #fff; 1419 background: #fff;
1388 float: left; 1420 float: left;
  1421 + margin-right: 15px;
1389 } 1422 }
1390 .recordLi2{ 1423 .recordLi2{
1391 width: 60%; 1424 width: 60%;
@@ -1395,6 +1428,11 @@ body{ @@ -1395,6 +1428,11 @@ body{
1395 .myCenterContentBox{ 1428 .myCenterContentBox{
1396 float: left; 1429 float: left;
1397 width: 1005px; 1430 width: 1005px;
  1431 + display: none;
  1432 +}
  1433 +.myCenterContentBox1{
  1434 + background: #fff;
  1435 + margin-bottom:40px;
1398 } 1436 }
1399 .myCenterTopLeftBox{ 1437 .myCenterTopLeftBox{
1400 width:330px; 1438 width:330px;
@@ -1403,7 +1441,8 @@ body{ @@ -1403,7 +1441,8 @@ body{
1403 float: left; 1441 float: left;
1404 font-size: 14px; 1442 font-size: 14px;
1405 color: #333333; 1443 color: #333333;
1406 - margin:0 15px; 1444 + margin-right:15px;
  1445 + margin-bottom:15px;
1407 } 1446 }
1408 .teacherMyCenter1{ 1447 .teacherMyCenter1{
1409 padding:30px 0 15px 30px; 1448 padding:30px 0 15px 30px;
@@ -1421,6 +1460,7 @@ body{ @@ -1421,6 +1460,7 @@ body{
1421 .teacherMyCenterInfo{ 1460 .teacherMyCenterInfo{
1422 float: left; 1461 float: left;
1423 width: 100%; 1462 width: 100%;
  1463 + padding-top:5px;
1424 } 1464 }
1425 .teacherMyCenter2{ 1465 .teacherMyCenter2{
1426 float: left; 1466 float: left;
@@ -1440,7 +1480,7 @@ body{ @@ -1440,7 +1480,7 @@ body{
1440 display: inline-block; 1480 display: inline-block;
1441 } 1481 }
1442 .myCenterTopRightBox{ 1482 .myCenterTopRightBox{
1443 - width: 600px; 1483 + width: 620px;
1444 height: 140px; 1484 height: 140px;
1445 background: #fff; 1485 background: #fff;
1446 padding: 20px; 1486 padding: 20px;
@@ -1449,7 +1489,8 @@ body{ @@ -1449,7 +1489,8 @@ body{
1449 .myCenterTopRightTit{ 1489 .myCenterTopRightTit{
1450 font-size: 16px; 1490 font-size: 16px;
1451 color: #333333; 1491 color: #333333;
1452 - padding-bottom:20px; 1492 + padding-bottom: 10px;
  1493 + display: inline-block;
1453 } 1494 }
1454 .teacherTodayCourseList{ 1495 .teacherTodayCourseList{
1455 font-size: 12px; 1496 font-size: 12px;
@@ -1481,19 +1522,18 @@ body{ @@ -1481,19 +1522,18 @@ body{
1481 float: right; 1522 float: right;
1482 } 1523 }
1483 .myCenterContentTitleBox{ 1524 .myCenterContentTitleBox{
1484 - width:985px; 1525 + width:1005px;
1485 height:44px; 1526 height:44px;
1486 line-height: 44px; 1527 line-height: 44px;
1487 - margin:15px 0 15px 15px;  
1488 background: #fff; 1528 background: #fff;
1489 font-size: 12px; 1529 font-size: 12px;
1490 color:#666666; 1530 color:#666666;
1491 float: left; 1531 float: left;
1492 } 1532 }
1493 .myCenterContentList{ 1533 .myCenterContentList{
1494 - width:985px; 1534 + width:1005px;
1495 float: left; 1535 float: left;
1496 - margin-left:15px; 1536 + margin-top:15px;
1497 } 1537 }
1498 .classifyListMyCenter{ 1538 .classifyListMyCenter{
1499 width: 235px; 1539 width: 235px;
@@ -1530,4 +1570,191 @@ body{ @@ -1530,4 +1570,191 @@ body{
1530 color:#999999; 1570 color:#999999;
1531 font-size: 12px; 1571 font-size: 12px;
1532 padding-right: 5px; 1572 padding-right: 5px;
  1573 +}
  1574 +/*个人信息*/
  1575 +.oneselfTitle{
  1576 + padding:25px 0 25px 15px;
  1577 + margin-left:30px;
  1578 + border-bottom: 1px solid #ebebeb;
  1579 + font-size: 16px;
  1580 + color: #333333;
  1581 + display: inline-block;
  1582 + width: 945px;
  1583 +}
  1584 +.oneselfInfoUI{
  1585 + padding-bottom:20px;
  1586 +}
  1587 +.oneselfInfoList{
  1588 + padding:30px 0 0 45px;
  1589 +}
  1590 +.oneselfInfoList1{
  1591 +}
  1592 +.oneselfInfoHeader{
  1593 + font-size: 14px;
  1594 + color:#999999;
  1595 + width: 80px;
  1596 + display: inline-block;
  1597 +}
  1598 +.oneselfInfoInput{
  1599 + width:251px;
  1600 + height: 34px;
  1601 + line-height: 34px;
  1602 + padding-left:5px;
  1603 + border:1px solid #ebebeb;
  1604 + color:#999999;
  1605 + font-size: 14px;
  1606 +}
  1607 +.accountInfoList{
  1608 + height: 85px;
  1609 + margin:0 30px;
  1610 + border-bottom:1px solid #ebebeb;
  1611 +}
  1612 +.accountInfoList1{
  1613 + border:none;
  1614 +}
  1615 +.accountInfoIcon{
  1616 + font-size: 16px;
  1617 + line-height: 85px;
  1618 + padding:0 20px;
  1619 + color:#d95136;
  1620 + float: left;
  1621 +}
  1622 +.accountInfoBtn{
  1623 + width:76px;
  1624 + height:34px;
  1625 + line-height: 34px;
  1626 + border:1px solid #ebebeb;
  1627 + font-size: 14px;
  1628 + color:#666666;
  1629 + float: right;
  1630 + text-align: center;
  1631 + cursor: pointer;
  1632 + margin-top: 25px;
  1633 + margin-right: 20px;
  1634 +}
  1635 +.accountInfo{
  1636 + float: left;
  1637 +}
  1638 +.significanceInfo{
  1639 + font-weight: bold;
  1640 + width: 100%;
  1641 + float: left;
  1642 + font-size: 16px;
  1643 + color:#333;
  1644 + padding-top:30px;
  1645 +}
  1646 +.significanceInfoTit{
  1647 + padding-right: 20px;
  1648 +}
  1649 +.significanceInfoHint{
  1650 + color:#999999;
  1651 + font-size: 12px;
  1652 + padding-top:5px;
  1653 +}
  1654 +.accountInfoSaveBtn{
  1655 + float: right;
  1656 + background: #3498db;
  1657 + color:#fff;
  1658 +}
  1659 +.courseMinuteList{
  1660 + float: left;
  1661 +}
  1662 +.courseMinuteListTimeTit{
  1663 + height:60px;
  1664 +}
  1665 +.courseMinuteListTime{
  1666 + font-size: 16px;
  1667 + color:#666666;
  1668 + line-height: 60px;
  1669 + padding-right: 25px;
  1670 +}
  1671 +.courseMinuteListWire{
  1672 + width: 866px;
  1673 + height: 1px;
  1674 + background: #cccccc;
  1675 + margin-top: 30px;
  1676 + display: inline-block;
  1677 +}
  1678 +.teacherCorrelatedInfoBox{
  1679 + margin-top:15px;
  1680 + float: left;
  1681 + width: 1005px;
  1682 + height:200px;
  1683 + background: #fff;
  1684 +}
  1685 +.teacherCorrelatedInfoLeft{
  1686 + width: 450px;
  1687 +}
  1688 +.teacherCorrelatedInfoImg{
  1689 + float: left;
  1690 + margin:30px 40px 0 30px;
  1691 +}
  1692 +.teacherCorrelatedInfo{
  1693 + float: left;
  1694 + width: 260px;
  1695 +}
  1696 +.teacherCorrelatedInfoName{
  1697 + font-size: 16px;
  1698 + float: left;
  1699 + width: 100%;
  1700 + font-weight: bold;
  1701 + margin-top:30px;
  1702 +}
  1703 +.teacherCorrelatedInfoMajor{
  1704 + font-size: 14px;
  1705 + color:#999999;
  1706 + width: 100%;
  1707 + margin-top:10px;
  1708 + float: left;
  1709 +}
  1710 +.teacherCorrelatedInfoCourse{
  1711 + font-weight: bold;
  1712 + width: 100%;
  1713 + margin-top:10px;
  1714 + float: left;
  1715 +}
  1716 +.teacherCorrelatedInfoMajorMsg{
  1717 + font-size: 14px;
  1718 + width: 200px;
  1719 + overflow: hidden;
  1720 + margin-top:10px;
  1721 + text-overflow: ellipsis;
  1722 + float: left;
  1723 +}
  1724 +.cancelReservationBtn{
  1725 + width:108px;
  1726 + height: 36px;
  1727 + line-height: 36px;
  1728 + text-align: center;
  1729 + color:#333333;
  1730 + border-radius: 3px;
  1731 + border:1px solid #333333;
  1732 + cursor: pointer;
  1733 + font-size: 12px;
  1734 + float: left;
  1735 + margin-top:10px;
  1736 +}
  1737 +.teacherCorrelatedInfoCenter{
  1738 + float: left;
  1739 + margin-top: 20px;
  1740 +}
  1741 +.teacherCorrelatedInfoCenter img{
  1742 + width:230px;
  1743 + height: 160px;
  1744 + margin-right: 20px;
  1745 + float: left;
  1746 +}
  1747 +.teacherCorrelatedInfoBtn{
  1748 + width:72px;
  1749 + height: 34px;
  1750 + background: #3498db;
  1751 + color:#fff;
  1752 + text-align: center;
  1753 + line-height: 34px;
  1754 + margin-right: 30px;
  1755 + font-size: 14px;
  1756 + border-radius: 3px;
  1757 + cursor: pointer;
  1758 + float: right;
  1759 + margin-top:83px;
1533 } 1760 }
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <span class="lanclassContentInfoTimeStart" id="lanclassContentInfoTimeStart">开始时间：2017-08-01 13:00:00</span> 119 <span class="lanclassContentInfoTimeStart" id="lanclassContentInfoTimeStart">开始时间：2017-08-01 13:00:00</span>
120 <span class="lanclassContentInfoTimeEnd" id="lanclassContentInfoTimeEnd">结束时间：2017-08-01 13:00:00</span> 120 <span class="lanclassContentInfoTimeEnd" id="lanclassContentInfoTimeEnd">结束时间：2017-08-01 13:00:00</span>
121 </div> 121 </div>
122 - <div class="lanclassContentApply btnHover" id="lanclassContentApply">我要报名</div> 122 + <div class="lanclassContentApply btnHover" id="lanclassContentApply" data="2">我要报名</div>
123 </div> 123 </div>
124 <div class="lanclassContentRight"> 124 <div class="lanclassContentRight">
125 <div class="thirdPartyIconBox"> 125 <div class="thirdPartyIconBox">
@@ -127,11 +127,11 @@ @@ -127,11 +127,11 @@
127 <span id="qqIcon" class="thirdPartyIcon qqIcon iconfont">&#xe605;</span> 127 <span id="qqIcon" class="thirdPartyIcon qqIcon iconfont">&#xe605;</span>
128 <span id="weiboIcon" class="thirdPartyIcon weiboIcon iconfont">&#xe6eb;</span> 128 <span id="weiboIcon" class="thirdPartyIcon weiboIcon iconfont">&#xe6eb;</span>
129 </div> 129 </div>
130 - <div class="collectBox" id="collectYes"> 130 + <div class="collectBox" id="collectYes" data="0">
131 <img class="collectIcon" id="collectYesIcon" src="images/collect.png" alt=""> 131 <img class="collectIcon" id="collectYesIcon" src="images/collect.png" alt="">
132 <span class="collectText">已收藏</span> 132 <span class="collectText">已收藏</span>
133 </div> 133 </div>
134 - <div class="collectBox" id="collectNo"> 134 + <div class="collectBox" id="collectNo" data="0">
135 <img class="collectIcon" id="collectNoIcon" src="images/not-collect.png" alt=""> 135 <img class="collectIcon" id="collectNoIcon" src="images/not-collect.png" alt="">
136 <span class="collectText">未收藏</span> 136 <span class="collectText">未收藏</span>
137 </div> 137 </div>
@@ -197,7 +197,7 @@ @@ -197,7 +197,7 @@
197 授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容 197 授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容
198 </p> 198 </p>
199 </div> 199 </div>
200 - <button class="teacherDetailOrderBtn btnHover" id="orderBtn">我要预约</button> 200 + <button class="teacherDetailOrderBtn btnHover" id="orderBtn" data="1">我要预约</button>
201 </div> 201 </div>
202 </div> 202 </div>
203 <div class="teacherDetailContent"> 203 <div class="teacherDetailContent">
@@ -946,99 +946,211 @@ @@ -946,99 +946,211 @@
946 </div> 946 </div>
947 </div> 947 </div>
948 </div> 948 </div>
949 - <!--个人中心--> 949 +
950 <div id="myCenterBox" class="myCenterBox"> 950 <div id="myCenterBox" class="myCenterBox">
951 <div class="myCenterLeftBox"> 951 <div class="myCenterLeftBox">
952 <ul class="recordUl" id="teacherUI"> 952 <ul class="recordUl" id="teacherUI">
953 - <li class="recordLi recordLi2 recordLiCheck"> 953 + <li class="recordLi recordLi2 recordLiCheck" data="0">
954 <label for="courseManagement" class="iconfont">&#xe699;</label> 954 <label for="courseManagement" class="iconfont">&#xe699;</label>
955 <span class="recordLiText" id="teacherHomeBtn">首页</span> 955 <span class="recordLiText" id="teacherHomeBtn">首页</span>
956 </li> 956 </li>
957 - <li class="recordLi recordLi2"> 957 + <li class="recordLi recordLi2" data="1">
958 <label for="createClassBtn" class="iconfont">&#xe69a;</label> 958 <label for="createClassBtn" class="iconfont">&#xe69a;</label>
959 <span class="recordLiText" id="teacherCoursesBtn">我的课程</span> 959 <span class="recordLiText" id="teacherCoursesBtn">我的课程</span>
960 </li> 960 </li>
961 - <li class="recordLi recordLi2"> 961 + <li class="recordLi recordLi2" data="2">
962 <label for="classManagement" class="iconfont">&#xe6a4;</label> 962 <label for="classManagement" class="iconfont">&#xe6a4;</label>
963 <span class="recordLiText" id="teacherOrderBtn">我的预约</span> 963 <span class="recordLiText" id="teacherOrderBtn">我的预约</span>
964 </li> 964 </li>
965 - <li class="recordLi recordLi2"> 965 + <li class="recordLi recordLi2" data="3">
966 <label for="personManagement" class="iconfont">&#xe6a1;</label> 966 <label for="personManagement" class="iconfont">&#xe6a1;</label>
967 <span class="recordLiText" id="teacherSetBtn">个人设置</span> 967 <span class="recordLiText" id="teacherSetBtn">个人设置</span>
968 </li> 968 </li>
969 </ul> 969 </ul>
970 </div> 970 </div>
971 - <div class="myCenterContentBox">  
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> 971 + <div class="myCenterContentBoxAll">
  972 + <!--个人中心主页-->
  973 + <div class="myCenterContentBox">
  974 + <div class="myCenterTopLeftBox">
  975 + <div class="teacherMyCenter1">
  976 + <img class="teacherMyCenterImg" src="images/u373.png" alt="">
  977 + <p class="teacherMyCenterInfoBox">
  978 + <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span>
  979 + <span class="teacherMyCenterInfo" id="teacherMyCenterName">小明同学</span>
  980 + </p>
  981 + </div>
  982 + <div class="teacherMyCenter2">
  983 + <label class="teacherMyCenterTitle">学习时长：</label>
  984 + <span class="learningTime">20小时08分钟</span>
  985 + </div>
  986 + <div class="teacherMyCenter2">
  987 + <label class="teacherMyCenterTitle">安全等级：</label>
  988 + <div class="teacherGradeImgBox">
  989 + <img class="teacherGradeImg" src="images/collect.png" alt="">
  990 + <img class="teacherGradeImg" src="images/collect.png" alt="">
  991 + <img class="teacherGradeImg" src="images/collect.png" alt="">
  992 + <img class="teacherGradeImg" src="images/not-collect.png" alt="">
  993 + <img class="teacherGradeImg" src="images/not-collect.png" alt="">
  994 + </div>
  995 + </div>
979 </div> 996 </div>
980 - <div class="teacherMyCenter2">  
981 - <label class="teacherMyCenterTitle">学习时长：</label>  
982 - <span class="learningTime">20小时08分钟</span> 997 + <div class="myCenterTopRightBox">
  998 + <label class="myCenterTopRightTit">今日课程</label>
  999 + <ul>
  1000 + <li class="teacherTodayCourseList">
  1001 + <span class="courseDetailInfo">《初中英语（上）》</span>
  1002 + <span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">00:09:10</i></span>
  1003 + <button class="teacherEnterClass btnHover">立即进入</button>
  1004 + </li>
  1005 + <li class="teacherTodayCourseList">
  1006 + <span class="courseDetailInfo">《初中英语（上）》</span>
  1007 + <span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">02:09:10</i></span>
  1008 + <button class="teacherEnterClass btnHover">立即进入</button>
  1009 + </li>
  1010 + </ul>
983 </div> 1011 </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=""> 1012 + <div class="myCenterContentTitleBox">
  1013 + <div class="liveInfoLeft" id="teacherInfoList">
  1014 + <div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div>
  1015 + <div class="liveInfoLeftLi">未开始</div>
  1016 + <div class="liveInfoLeftLi">已结束</div>
992 </div> 1017 </div>
993 </div> 1018 </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">  
1011 - <div class="liveInfoLeft" id="teacherInfoList">  
1012 - <div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div>  
1013 - <div class="liveInfoLeftLi">未开始</div>  
1014 - <div class="liveInfoLeftLi">已结束</div> 1019 + <div class="myCenterContentList">
  1020 + <div class="classifyListMyCenter">
  1021 + <img class="myCenterContentListImg" src="images/u373.png" alt="">
  1022 + <p class="myCenterContentListTit">初一英语阅读理解习题课</p>
  1023 + <p class="myCenterContentListTit1">主讲人：方圆</p>
  1024 + <p class="myCenterContentMin">45min</p>
  1025 + <span class="myCenterContentTimer">2016-09-12</span>
  1026 + </div>
  1027 + <div class="classifyListMyCenter">
  1028 + <img class="myCenterContentListImg" src="images/u373.png" alt="">
  1029 + <p class="myCenterContentListTit">初一英语阅读理解习题课</p>
  1030 + <p class="myCenterContentListTit1">主讲人：方圆</p>
  1031 + <p class="myCenterContentMin">45min</p>
  1032 + <span class="myCenterContentTimer">2016-09-12</span>
  1033 + </div>
  1034 + <div class="classifyListMyCenter">
  1035 + <img class="myCenterContentListImg" src="images/u373.png" alt="">
  1036 + <p class="myCenterContentListTit">初一英语阅读理解习题课</p>
  1037 + <p class="myCenterContentListTit1">主讲人：方圆</p>
  1038 + <p class="myCenterContentMin">45min</p>
  1039 + <span class="myCenterContentTimer">2016-09-12</span>
  1040 + </div>
1015 </div> 1041 </div>
1016 </div> 1042 </div>
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> 1043 + <!--我的课程-->
  1044 + <div class="myCenterContentBox">
  1045 + <div class="myCenterContentTitleBox studyContent">
  1046 + <div class="liveInfoLeft" id="courseInfoList">
  1047 + <div class="liveInfoLeftLi liveInfoLeftLiCheck">待学习</div>
  1048 + <div class="liveInfoLeftLi">已学完</div>
  1049 + <div class="liveInfoLeftLi">收藏</div>
  1050 + </div>
  1051 + </div>
  1052 + <div class="courseMinuteList">
  1053 + <div class="courseMinuteListTimeTit">
  1054 + <span class="courseMinuteListTime">2017-09-04</span>
  1055 + <span class="courseMinuteListWire"></span>
  1056 + </div>
  1057 + <div class="classifyListMyCenter">
  1058 + <img class="myCenterContentListImg" src="images/u374.png" alt="">
  1059 + <p class="myCenterContentListTit">初一英语阅读理解习题课</p>
  1060 + <p class="myCenterContentListTit1">主讲人：方圆</p>
  1061 + <p class="myCenterContentMin">45min</p>
  1062 + <span class="myCenterContentTimer">2016-09-12</span>
  1063 + </div>
1024 </div> 1064 </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> 1065 + </div>
  1066 + <!--我的预约-->
  1067 + <div class="myCenterContentBox">
  1068 + <div class="myCenterContentTitleBox studyContent">
  1069 + <div class="liveInfoLeft" id="subscribeList">
  1070 + <div class="liveInfoLeftLi liveInfoLeftLiCheck">课程</div>
  1071 + <div class="liveInfoLeftLi">老师</div>
  1072 + </div>
1031 </div> 1073 </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> 1074 + <div class="teacherCorrelatedInfoBox">
  1075 + <div class="teacherCorrelatedInfoLeft">
  1076 + <img class="teacherCorrelatedInfoImg" id="teacherCorrelatedInfoImg" src="images/u293.png" alt="">
  1077 + <div class="teacherCorrelatedInfo">
  1078 + <b class="teacherCorrelatedInfoName" id="teacherCorrelatedInfoName">张媛媛</b>
  1079 + <b class="teacherCorrelatedInfoMajor">北京市|少儿英语</b>
  1080 + <b class="teacherCorrelatedInfoCourse">课程:50</b>
  1081 + <span class="teacherCorrelatedInfoMajorMsg">毕业于外国语学院，专业8级</span>
  1082 + <p class="cancelReservationBtn" id="cancelReservationBtn">取消预约</p>
  1083 + </div>
  1084 + </div>
  1085 + <div class="teacherCorrelatedInfoCenter">
  1086 + <img src="images/u374.png" alt="">
  1087 + <img src="images/u374.png" alt="">
  1088 + </div>
  1089 + <div class="teacherCorrelatedInfoBtn">更多课程</div>
1038 </div> 1090 </div>
1039 </div> 1091 </div>
  1092 + <!--个人信息-->
  1093 + <div class="myCenterContentBox myCenterContentBox1">
  1094 + <label class="oneselfTitle">个人信息</label>
  1095 + <ul class="oneselfInfoUI">
  1096 + <li class="oneselfInfoList oneselfInfoList1">
  1097 + <label class="oneselfInfoHeader">头像</label>
  1098 + <img src="images/u293.png" alt="">
  1099 + </li>
  1100 + <li class="oneselfInfoList">
  1101 + <label class="oneselfInfoHeader">登录名</label>
  1102 + <input class="oneselfInfoInput" id="oneselfInfoLoginName" placeholder="yangyangyag" type="text">
  1103 + </li>
  1104 + <li class="oneselfInfoList">
  1105 + <label class="oneselfInfoHeader">姓名</label>
  1106 + <input class="oneselfInfoInput" id="oneselfInfoUserName" placeholder="洋洋" type="text">
  1107 + </li>
  1108 + <li class="oneselfInfoList">
  1109 + <label class="oneselfInfoHeader">性别</label>
  1110 + <input class="allowPublic allowPublicDetail" id="oneselfInfoMan" name="videoQuality" type="radio" value="0" checked="checked">
  1111 + <label for="oneselfInfoMan">
  1112 + 男
  1113 + </label>
  1114 + <input class="allowPublic allowPublicDetail" id="oneselfInfoWoman" name="videoQuality" type="radio" value="1">
  1115 + <label for="oneselfInfoWoman">
  1116 + 女
  1117 + </label>
  1118 + </li>
  1119 + </ul>
  1120 + <label class="oneselfTitle">账户信息</label>
  1121 + <ul class="accountInfoUI">
  1122 + <li class="accountInfoList">
  1123 + <label class="accountInfoIcon">&#xe6a8;</label>
  1124 + <div class="accountInfo">
  1125 + <span class="significanceInfo"><label>账号密码</label></span>
  1126 + <span class="significanceInfoHint">用于保护账号信息和登录安全</span>
  1127 + </div>
  1128 + <span class="accountInfoBtn">修改</span>
  1129 + </li>
  1130 + <li class="accountInfoList">
  1131 + <label class="accountInfoIcon">&#xe6a6;</label>
  1132 + <div class="accountInfo">
  1133 + <span class="significanceInfo"><label class="significanceInfoTit">安全邮箱</label><label id="setMail">hi*****n@3mang.com</label></span>
  1134 + <span class="significanceInfoHint">用于保护账号信息和登录安全</span>
  1135 + </div>
  1136 + <span class="accountInfoBtn">修改</span>
  1137 + </li>
  1138 + <li class="accountInfoList">
  1139 + <label class="accountInfoIcon">&#xe6a7;</label>
  1140 + <div class="accountInfo">
  1141 + <span class="significanceInfo"><label class="significanceInfoTit">安全手机</label><label id="setPhone">139*****168</label></span>
  1142 + <span class="significanceInfoHint">用于保护账号信息和登录安全</span>
  1143 + </div>
  1144 + <span class="accountInfoBtn">修改</span>
  1145 + </li>
  1146 + <li class="accountInfoList accountInfoList1">
  1147 + <button class="accountInfoBtn accountInfoSaveBtn" id="accountInfoSaveBtn">保存</button>
  1148 + </li>
  1149 + </ul>
  1150 + </div>
1040 </div> 1151 </div>
1041 </div> 1152 </div>
  1153 +
1042 </div> 1154 </div>
1043 <div class="footerBg"> 1155 <div class="footerBg">
1044 <div class="footer"> 1156 <div class="footer">
@@ -1160,5 +1272,10 @@ @@ -1160,5 +1272,10 @@
1160 </div> 1272 </div>
1161 </div> 1273 </div>
1162 </div> 1274 </div>
  1275 +<!--warn提示信息-->
  1276 +<div class="warnHintBox" id="warnHintBox">
  1277 + <a href="javascript: void(0)" class="warnHintA iconfont" id="warnHintA">&#xe638;</a>
  1278 + <p class="warnHintContent" id="warnHintContent"></p>
  1279 +</div>
1163 </body> 1280 </body>
1164 </html> 1281 </html>
@@ -48,7 +48,7 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= @@ -48,7 +48,7 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
48 <a id="{_musicInd}" class="classHandlePort" href="">伴音</a> 48 <a id="{_musicInd}" class="classHandlePort" href="">伴音</a>
49 <a id="{_updateInd}" class="classHandlePort" href="">修改</a> 49 <a id="{_updateInd}" class="classHandlePort" href="">修改</a>
50 <a id="{_removeInd}" class="classHandlePort" href="">删除</a> 50 <a id="{_removeInd}" class="classHandlePort" href="">删除</a>
51 - <a id="{_joinInd}" class="classHandlePort" href="">加入课堂</a> 51 + <a id="{_joinInd}" class="classHandlePort" data="{_esenglish}" href="###">加入课堂</a>
52 </td> 52 </td>
53 </tr> 53 </tr>
54 `; 54 `;
@@ -73,6 +73,8 @@ class AdministratorApe extends Ape { @@ -73,6 +73,8 @@ class AdministratorApe extends Ape {
73 $('#classHandlerDownPage').on('click',this._downPageHandler.bind(this));//下页 73 $('#classHandlerDownPage').on('click',this._downPageHandler.bind(this));//下页
74 $('#classHandlerEndPage').on('click',this._endPageHandler.bind(this));//尾页 74 $('#classHandlerEndPage').on('click',this._endPageHandler.bind(this));//尾页
75 $('#classHandlerSpecificPage').on('click',this._assignPageHandler.bind(this));//指定页 75 $('#classHandlerSpecificPage').on('click',this._assignPageHandler.bind(this));//指定页
  76 +
  77 + $('#courseContent').on('click','.classHandlePort',this._classHandlePortHandler.bind(this));//加入课堂
76 } 78 }
77 79
78 addEvent() { 80 addEvent() {
@@ -114,7 +116,11 @@ class AdministratorApe extends Ape { @@ -114,7 +116,11 @@ class AdministratorApe extends Ape {
114 this._pageNumBtnHandler(parseInt(inputVal)); 116 this._pageNumBtnHandler(parseInt(inputVal));
115 } 117 }
116 } 118 }
117 - 119 + _classHandlePortHandler(evt){
  120 + let id = $(evt.target).attr('data');
  121 + loger.log(id,11111111111)
  122 + // window.open('/3m/attend.do?meetingNumber=' + id);
  123 + }
118 //点击翻页 124 //点击翻页
119 _pageNumBtnHandler(ind){ 125 _pageNumBtnHandler(ind){
120 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting'; 126 let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
@@ -16,35 +16,12 @@ class ErrorApe extends Ape { @@ -16,35 +16,12 @@ class ErrorApe extends Ape {
16 16
17 } 17 }
18 init(){ 18 init(){
19 - $('.errorFlashHintA').on('click',this._hideErrorHintHandler.bind(this));  
20 - $('.errorSetFlashHintB').on('click',this._showErrorDetectionFlashParticular.bind(this));  
21 - //各浏览器设置信息跳转  
22 - $('#e_speed360').on('click',this._skipNewWindow.bind(this));  
23 - $('#e_chrome').on('click',this._skipNewWindow.bind(this));  
24 - $('#e_firefox').on('click',this._skipNewWindow.bind(this));  
25 - $('#e_ie10').on('click',this._skipNewWindow.bind(this));  
26 - $('#e_security360').on('click',this._skipNewWindow.bind(this));  
27 - $('#e_2345').on('click',this._skipNewWindow.bind(this));  
28 - $('#e_qq').on('click',this._skipNewWindow.bind(this));  
29 - $('#e_sogou').on('click',this._skipNewWindow.bind(this));  
30 - $('#e_safari').on('click',this._skipNewWindow.bind(this));  
31 -  
32 //警告框warn 关闭事件 19 //警告框warn 关闭事件
33 $('#warnHintA').on('click',this._hideWarnError.bind(this)); 20 $('#warnHintA').on('click',this._hideWarnError.bind(this));
34 } 21 }
35 -  
36 - show(){  
37 - $('.errorHintBox').show();  
38 - }  
39 - hide(){  
40 - $('.errorHintBox').hide();  
41 - $('#publicChoiceErrorrBox').hide();  
42 - }  
43 - _hideErrorHintHandler(evt){  
44 - let parents = $(evt.target).parents('.errorHint');  
45 - parents.attr('data','');  
46 - parents.hide();  
47 - this.judgeDisplayStatus(); 22 + _hideWarnError(){
  23 + clearTimeout(this._isTime);
  24 + $('#warnHintBox').hide();
48 } 25 }
49 //关闭warn提示框 26 //关闭warn提示框
50 _hideWarnError(){ 27 _hideWarnError(){
@@ -62,97 +39,8 @@ class ErrorApe extends Ape { @@ -62,97 +39,8 @@ class ErrorApe extends Ape {
62 this.hide(); 39 this.hide();
63 } 40 }
64 } 41 }
65 - showError(_type,_msg,_callback){  
66 - this.show();  
67 - switch (_type){  
68 - case ErrorApe.TYPE_1:  
69 - //显示直播兼容浏览器  
70 - this.showErrorTestLive();  
71 - break;  
72 - case ErrorApe.TYPE_2:  
73 - //显示回放兼容浏览器  
74 - this.showErrorPlayback();  
75 - break;  
76 - case ErrorApe.TYPE_3:  
77 - //公用的弹出框  
78 - this.showPublicError(_msg);  
79 - break;  
80 - /* case ErrorApe.TYPE_4:  
81 - this.showErrorCamera(_msg);  
82 - break;  
83 - case ErrorApe.TYPE_5:  
84 - this.showErrorOccupyMicrophone(_msg);  
85 - break;  
86 - case ErrorApe.TYPE_6:  
87 - this.showErrorOccupyCamera(_msg);  
88 - break;*/  
89 - case ErrorApe.TYPE_7:  
90 - break;  
91 - case ErrorApe.TYPE_8:  
92 - //下载flash  
93 - this.showErrorDetectionFlash(_msg,true);  
94 - break;  
95 - case ErrorApe.TYPE_9:  
96 - //设置浏览器的flash使用权限  
97 - this.showErrorDetectionFlash(_msg,false);  
98 - break;  
99 - case ErrorApe.TYPE_10:  
100 - //safari falsh 提示开启权限  
101 - this.showErrorSafariFlash();  
102 - break;  
103 - case ErrorApe.TYPE_11:  
104 - //QQ Chrome falsh 提示开启权限  
105 - this.showErrorQQOrChromeFlash();  
106 - break;  
107 - case ErrorApe.TYPE_12:  
108 - //搜狗 360极速 falsh 提示开启权限  
109 - this.showErrorSougouOr360jisuFlash();  
110 - break;  
111 - case ErrorApe.TYPE_13:  
112 - //开启chrome flash权限  
113 - this.showSetChromeFlash();  
114 - break;  
115 - case ErrorApe.TYPE_14:  
116 - //开启Firefox flash权限  
117 - this.showSetFirefoxFlash();  
118 - break;  
119 - case ErrorApe.TYPE_15:  
120 - //开启QQ flash权限  
121 - this.showSetQQFlash();  
122 - break;  
123 - case ErrorApe.TYPE_16:  
124 - //开启2345 flash权限  
125 - this.showSet2345Flash();  
126 - break;  
127 - case ErrorApe.TYPE_17:  
128 - //开启360安全 flash权限  
129 - this.showSet360anquanFlash();  
130 - break;  
131 - case ErrorApe.TYPE_18:  
132 - //开启极速 flash权限  
133 - this.showSet360jisuFlash();  
134 - break;  
135 - case ErrorApe.TYPE_19:  
136 - //开启搜狗 flash权限  
137 - this.showSetsougouFlash();  
138 - break;  
139 - case ErrorApe.TYPE_20:  
140 - //显示询问弹框  
141 - this.showPublicChoiceErrorrBox(_msg,_callback);  
142 - break;  
143 - case ErrorApe.TYPE_23:  
144 - this.showErrorPublic(_msg);  
145 - break;  
146 - case ErrorApe.TYPE_24:  
147 - this.showNetworkDisconnection(_msg);  
148 - break;  
149 - default:  
150 - this.hide();  
151 - break;  
152 - }  
153 - }  
154 //显示warn提示框 倒计时结束自动关闭盒子 42 //显示warn提示框 倒计时结束自动关闭盒子
155 - showWarnError(_msg,_time=5){ 43 + showWarnError(_msg,_time=3){
156 clearTimeout(this._isTime); 44 clearTimeout(this._isTime);
157 $('#warnHintBox').show(); 45 $('#warnHintBox').show();
158 $('#warnHintContent').html(_msg); 46 $('#warnHintContent').html(_msg);
@@ -162,182 +50,11 @@ class ErrorApe extends Ape { @@ -162,182 +50,11 @@ class ErrorApe extends Ape {
162 },time) 50 },time)
163 } 51 }
164 52
165 - //各个盒子的显示  
166 - //显示直播兼容浏览器  
167 - showErrorTestLive(){  
168 - $('.errorTestLive').show().attr('data','open');  
169 - }  
170 - //显示回放兼容浏览器  
171 - showErrorPlayback(){  
172 - $('.errorPlayback').show().attr('data','open');  
173 - }  
174 - //公用的弹出框  
175 - showPublicError(_msg){  
176 - $('.publicErrorBox').show().attr('data','open');  
177 - $('.publicErrorBox').find('.errorPublicHintContent').html(_msg);  
178 - }  
179 - showErrorCamera(_msg){  
180 - $('.notCamera').show().attr('data','open');  
181 - $('.notCamera').find('.errorHintContent').html(_msg);  
182 - }  
183 - showErrorOccupyMicrophone(_msg){  
184 - $('.occupyMicrophone').show().attr('data','open');  
185 - $('.occupyMicrophone').find('.errorHintContent').html(_msg);  
186 - }  
187 - showErrorOccupyCamera(_msg){  
188 - $('.publicErrorBox').show().attr('data','open');  
189 - $('.publicErrorBox').find('.errorHintContent').html(_msg);  
190 - }  
191 - //设备中没有检测到flash/flash被禁用  
192 - showErrorDetectionFlash(_msg,_isDownload=false){  
193 - $('#notDetectionFlash').show().attr('data','open');  
194 - if(_isDownload==true){  
195 - //显示下载flash  
196 - $('#flashDetailSteps').hide();  
197 - $('#flashUpdataVersions').show();  
198 - }else {  
199 - //显示浏览器设置flash  
200 - $('#flashDetailSteps').show();  
201 - $('#flashUpdataVersions').hide();  
202 - }  
203 - }  
204 - _showErrorDetectionFlashParticular(){  
205 - $('.notDetectionFlash').hide().attr('data','');  
206 - $('.notDetectionFlash_1').show().attr('data','open');  
207 - }  
208 - //设备中的flash版本过低,提示信息  
209 - showErrorVersionsFlash(){  
210 - $('.versionsFlash').show().attr('data','open');  
211 - }  
212 - //safari falsh 提示开启权限  
213 - showErrorSafariFlash(){  
214 - $('.safariFlashBan').show().attr('data','open');  
215 - }  
216 - //QQ Chrome falsh 提示开启权限  
217 - showErrorQQOrChromeFlash(){  
218 - $('.QQOrChromeFlashBan').show().attr('data','open');  
219 - }  
220 - //搜狗 360极速 falsh 提示开启权限  
221 - showErrorSougouOr360jisuFlash(){  
222 - $('.sougouOr360jisuFlashBan').show().attr('data','open');  
223 - }  
224 - //开启chrome flash权限  
225 - showSetChromeFlash(){  
226 - $('.setChromeFlash').show().attr('data','open');  
227 - }  
228 - //开启Firefox flash权限  
229 - showSetFirefoxFlash(){  
230 - $('.setFirefoxFlash').show().attr('data','open');  
231 - }  
232 - //开启QQ flash权限  
233 - showSetQQFlash(){  
234 - $('.setQQFlash').show().attr('data','open');  
235 - }  
236 - //开启2345 flash权限  
237 - showSet2345Flash(){  
238 - $('.set2345Flash').show().attr('data','open');  
239 - }  
240 - //开启360安全 flash权限  
241 - showSet360anquanFlash(){  
242 - $('.set360anquanFlash').show().attr('data','open');  
243 - }  
244 - //开启360极速 flash权限  
245 - showSet360jisuFlash(){  
246 - $('.set360jisuFlash').show().attr('data','open');  
247 - }  
248 - //开启搜狗 flash权限  
249 - showSetsougouFlash(){  
250 - $('.setsougouFlash').show().attr('data','open');  
251 - }  
252 - showCloseEndClass(_msg,_callback){  
253 - //$('.endClassHint').show().attr('data','open');  
254 - //if(_callback){  
255 - // $('.endClassHint').hide().attr('data','');  
256 - //}  
257 - this.showPublicChoiceErrorrBox(_msg,_callback);  
258 - }  
259 - showCloseExitClass(_msg,_callback){  
260 - //$('.exitClassHint').show().attr('data','open');  
261 - //if(_callback){  
262 - // $('.exitClassHint').hide().attr('data','');  
263 - //}  
264 - this.showPublicChoiceErrorrBox(_msg,_callback);  
265 - }  
266 - showCloseEndShare(_msg,_callback){  
267 - //$('.endShareHint').show().attr('data','open');  
268 - //if(_callback){  
269 - // $('.endShareHint').hide().attr('data','');  
270 - //}  
271 - this.showPublicChoiceErrorrBox(_msg,_callback);  
272 - }  
273 - showErrorPublic(_msg){  
274 - $('.errorPublicHint').show().attr('data','open');  
275 - $('.errorPublicHint').find('.errorPublicHintContent').html(_msg);  
276 - }  
277 - showNetworkDisconnection(_msg,_callback){  
278 - $('.networkDisconnection').show().attr('data','open');  
279 - $('.networkDisconnection').find('.errornetworkHintContent').html(_msg);  
280 - //if(_callback){  
281 - // $('.networkDisconnection').hide().attr('data','');  
282 - // this.judgeDisplayStatus();  
283 - //}  
284 - }  
285 -  
286 - //显示有确定和取消按钮的提示框  
287 - showPublicChoiceErrorrBox(_msg,_callback){  
288 - $('#publicChoiceErrorrBox').show();  
289 - $('#choiceHintBoxText').html(_msg);  
290 - $('#choiceConfirm').off("click");  
291 - $('#choiceCancel').off("click");  
292 - let _this=this;  
293 - $('#choiceConfirm').on("click",function(){  
294 - _this.hide();  
295 - if(_callback){  
296 - _callback(true);  
297 - }  
298 -  
299 - });  
300 - $('#choiceCancel').on("click",function(){  
301 - _this.hide();  
302 - if(_callback){  
303 - _callback(false);  
304 - }  
305 -  
306 - });  
307 - }  
308 - //各刘拉你设置flash跳转  
309 - _skipNewWindow(evt){  
310 - let _id = $(evt.target).attr('id');  
311 - window.open(this.PATH + '/' + this.language + '/' + _id + '.html');  
312 - }  
313 } 53 }
314 ErrorApe.prototype.TYPE_1=ErrorApe.TYPE_1=1;//兼容直播课堂的浏览器 54 ErrorApe.prototype.TYPE_1=ErrorApe.TYPE_1=1;//兼容直播课堂的浏览器
315 ErrorApe.prototype.TYPE_2=ErrorApe.TYPE_2=2;//兼容录制回放的浏览器 55 ErrorApe.prototype.TYPE_2=ErrorApe.TYPE_2=2;//兼容录制回放的浏览器
316 56
317 ErrorApe.prototype.TYPE_3=ErrorApe.TYPE_3=3;//没有麦克风 57 ErrorApe.prototype.TYPE_3=ErrorApe.TYPE_3=3;//没有麦克风
318 -/*ErrorApe.TYPE_4=4;//没有摄像头  
319 - ErrorApe.TYPE_5=5;//麦克风被占用  
320 - ErrorApe.TYPE_6=6;//摄像头被占用*/  
321 -ErrorApe.prototype.TYPE_7=ErrorApe.TYPE_7=7;//摄像头和麦克风权限  
322 -  
323 -ErrorApe.prototype.TYPE_8=ErrorApe.TYPE_8=8;//没有安装flash  
324 -ErrorApe.prototype.TYPE_9=ErrorApe.TYPE_9=9;//flash版本过低  
325 -  
326 -ErrorApe.prototype.TYPE_10=ErrorApe.TYPE_10=10;//flash被禁用 safari  
327 -ErrorApe.prototype.TYPE_11=ErrorApe.TYPE_11=11;//flash被禁用 QQ 谷歌  
328 -ErrorApe.prototype.TYPE_12=ErrorApe.TYPE_12=12;//flash被禁用 搜狗 360极速  
329 -ErrorApe.prototype.TYPE_13=ErrorApe.TYPE_13=13;//flash被禁用 点击拒绝 谷歌  
330 -ErrorApe.prototype.TYPE_14=ErrorApe.TYPE_14=14;//flash被禁用 点击拒绝 火狐  
331 -ErrorApe.prototype.TYPE_15=ErrorApe.TYPE_15=15;//flash被禁用 点击拒绝 QQ  
332 -ErrorApe.prototype.TYPE_16=ErrorApe.TYPE_16=16;//flash被禁用 点击拒绝 2345  
333 -ErrorApe.prototype.TYPE_17=ErrorApe.TYPE_17=17;//flash被禁用 点击拒绝 360安全  
334 -ErrorApe.prototype.TYPE_18=ErrorApe.TYPE_18=18;//flash被禁用 点击拒绝 360极速  
335 -ErrorApe.prototype.TYPE_19=ErrorApe.TYPE_19=19;//flash被禁用 点击拒绝 搜狗  
336 -  
337 -ErrorApe.prototype.TYPE_20=ErrorApe.TYPE_20=20;//结束课堂提示信息  
338 -ErrorApe.prototype.TYPE_21=ErrorApe.TYPE_21=21;//退出课堂提示信息  
339 -ErrorApe.prototype.TYPE_22=ErrorApe.TYPE_22=22;//屏幕共享提示信息  
340 -ErrorApe.prototype.TYPE_23=ErrorApe.TYPE_23=23;//错误提示信息  
341 58
342 ErrorApe.prototype.TYPE_24=ErrorApe.TYPE_24=24;//显示退出课堂 59 ErrorApe.prototype.TYPE_24=ErrorApe.TYPE_24=24;//显示退出课堂
343 ErrorApe.prototype.language=ErrorApe.language="zh_cn";//设置默认语言为中文 60 ErrorApe.prototype.language=ErrorApe.language="zh_cn";//设置默认语言为中文
@@ -46,9 +46,7 @@ class HomeApe extends Ape { @@ -46,9 +46,7 @@ class HomeApe extends Ape {
46 46
47 } 47 }
48 isLocalStorage(){ 48 isLocalStorage(){
49 - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_0 || ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){  
50 - this.detailPage();  
51 - } 49 + this.detailPage();
52 } 50 }
53 _judgeListPlace(){ 51 _judgeListPlace(){
54 let i; 52 let i;
@@ -76,7 +74,7 @@ class HomeApe extends Ape { @@ -76,7 +74,7 @@ class HomeApe extends Ape {
76 success:function(_data){ 74 success:function(_data){
77 // loger.log(_data,'成功') 75 // loger.log(_data,'成功')
78 //获取课堂数据 76 //获取课堂数据
79 - if(_data || _data.code == 200){ 77 + if(_data && _data.code == 200){
80 that._gainClassData(_data.returnData.data); 78 that._gainClassData(_data.returnData.data);
81 } 79 }
82 }, 80 },
@@ -98,7 +96,7 @@ class HomeApe extends Ape { @@ -98,7 +96,7 @@ class HomeApe extends Ape {
98 success:function(_data){ 96 success:function(_data){
99 // loger.log(_data,'成功') 97 // loger.log(_data,'成功')
100 //获取课堂数据 98 //获取课堂数据
101 - if(_data || _data.code == 200){ 99 + if(_data && _data.code == 200){
102 that._gainClassData(_data.returnData.data); 100 that._gainClassData(_data.returnData.data);
103 } 101 }
104 }, 102 },
@@ -132,6 +130,7 @@ class HomeApe extends Ape { @@ -132,6 +130,7 @@ class HomeApe extends Ape {
132 teacherIntro.empty(); 130 teacherIntro.empty();
133 if(_data){ 131 if(_data){
134 let _dataList = _data.meetingInfo; 132 let _dataList = _data.meetingInfo;
  133 + loger.log('显示当前时间',_dataList[0])
135 for(let i = 0;i<_dataList.length;i++){ 134 for(let i = 0;i<_dataList.length;i++){
136 if(i<8){ 135 if(i<8){
137 let j = (i%4)==3; 136 let j = (i%4)==3;
@@ -115,7 +115,7 @@ class LanclassApe extends Ape { @@ -115,7 +115,7 @@ class LanclassApe extends Ape {
115 }) 115 })
116 } 116 }
117 _gainClassData(_data){ 117 _gainClassData(_data){
118 - if(_data || _data.code == 200){ 118 + if(_data && _data.code == 200){
119 this.classDateList = _data.returnData.data; 119 this.classDateList = _data.returnData.data;
120 let classifyListContent = $('#classifyListContent'); 120 let classifyListContent = $('#classifyListContent');
121 classifyListContent.empty(); 121 classifyListContent.empty();
@@ -13,11 +13,12 @@ class ListDetailsApe extends Ape { @@ -13,11 +13,12 @@ class ListDetailsApe extends Ape {
13 super(); 13 super();
14 this.addEvent(); 14 this.addEvent();
15 this.isDate = 0; 15 this.isDate = 0;
  16 + this._id = '';
16 this.init(); 17 this.init();
17 } 18 }
18 19
19 init() { 20 init() {
20 - $('#themeBox ').on('click','.classifyList',this._curriculumListHandler.bind(this)); 21 + $('#themeBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//详情页
21 $('#collectYes ').on('click',this._collectYesHandler.bind(this)); 22 $('#collectYes ').on('click',this._collectYesHandler.bind(this));
22 $('#collectNo ').on('click',this._collectNoHandler.bind(this)); 23 $('#collectNo ').on('click',this._collectNoHandler.bind(this));
23 } 24 }
@@ -28,6 +29,7 @@ class ListDetailsApe extends Ape { @@ -28,6 +29,7 @@ class ListDetailsApe extends Ape {
28 _curriculumListHandler(evt){ 29 _curriculumListHandler(evt){
29 $('#slideshow').hide(); 30 $('#slideshow').hide();
30 let _id = evt.currentTarget.id; 31 let _id = evt.currentTarget.id;
  32 + this._id = _id;
31 let isDate = $(evt.currentTarget).attr('data'); 33 let isDate = $(evt.currentTarget).attr('data');
32 this.isDate = isDate; 34 this.isDate = isDate;
33 this.detailPage(_id); 35 this.detailPage(_id);
@@ -58,7 +60,7 @@ class ListDetailsApe extends Ape { @@ -58,7 +60,7 @@ class ListDetailsApe extends Ape {
58 data:signInfo, 60 data:signInfo,
59 success:function(_data){ 61 success:function(_data){
60 //获取课堂数据 62 //获取课堂数据
61 - if(_data || _data.code == 200){ 63 + if(_data && _data.code == 200){
62 that._gainClassData(_data); 64 that._gainClassData(_data);
63 } 65 }
64 }, 66 },
@@ -72,6 +74,7 @@ class ListDetailsApe extends Ape { @@ -72,6 +74,7 @@ class ListDetailsApe extends Ape {
72 this._classDateContent(_data.returnData.data); 74 this._classDateContent(_data.returnData.data);
73 } 75 }
74 _classDateContent(_data){ 76 _classDateContent(_data){
  77 + loger.log('进入详细页显示信息',_data)
75 let _dataList = _data.meetingInfo[0]; 78 let _dataList = _data.meetingInfo[0];
76 if(this.isDate){ 79 if(this.isDate){
77 this._lanclassRender(_dataList); 80 this._lanclassRender(_dataList);
@@ -85,7 +88,7 @@ class ListDetailsApe extends Ape { @@ -85,7 +88,7 @@ class ListDetailsApe extends Ape {
85 $('#defaultBox').hide(); 88 $('#defaultBox').hide();
86 $('.curriculumBox').hide(); 89 $('.curriculumBox').hide();
87 $('#teacherDetailBox').show(); 90 $('#teacherDetailBox').show();
88 - 91 + $('#teacherDetailBox').attr('data',this._id);
89 $('#teacherDetailInfoImg').attr('src','images/u293.png');//老师授课标题图片 92 $('#teacherDetailInfoImg').attr('src','images/u293.png');//老师授课标题图片
90 $('#teacherDetailInfoDetailName').text(_dataList.userName);//老师名字 93 $('#teacherDetailInfoDetailName').text(_dataList.userName);//老师名字
91 $('#teacherDetailInfoDetailSex').text();//老师性别 94 $('#teacherDetailInfoDetailSex').text();//老师性别
@@ -106,11 +109,11 @@ class ListDetailsApe extends Ape { @@ -106,11 +109,11 @@ class ListDetailsApe extends Ape {
106 $('#defaultBox').hide(); 109 $('#defaultBox').hide();
107 $('.curriculumBox').hide(); 110 $('.curriculumBox').hide();
108 $('#lanclassBox').show(); 111 $('#lanclassBox').show();
109 - 112 + $('#lanclassBox').attr('data',this._id);
110 $('#lanclassContentCover').attr('src','images/u373.png');//老师授课标题图片 113 $('#lanclassContentCover').attr('src','images/u373.png');//老师授课标题图片
111 - $('#lanclassContentTitle').text();//老师授课标题 114 + $('#lanclassContentTitle').text(_dataList.meetingName);//老师授课标题
112 $('#lanclassContentInfoPortrait').text();//老师授课老师头像 115 $('#lanclassContentInfoPortrait').text();//老师授课老师头像
113 - $('#lanclassContentInfoName').text();//老师授课老师名字 116 + $('#lanclassContentInfoName').text(_dataList.create_user);//老师授课老师名字
114 $('#lanclassContentInfoTimeStart').text(_dataList.createTime);//老师授课开始时间 117 $('#lanclassContentInfoTimeStart').text(_dataList.createTime);//老师授课开始时间
115 $('#lanclassContentInfoTimeEnd').text(_dataList.endTime);//老师授课结束时间 118 $('#lanclassContentInfoTimeEnd').text(_dataList.endTime);//老师授课结束时间
116 $('#collectYes');//老师授课是否收藏 119 $('#collectYes');//老师授课是否收藏
@@ -115,7 +115,7 @@ class LanclassApe extends Ape { @@ -115,7 +115,7 @@ class LanclassApe extends Ape {
115 }) 115 })
116 } 116 }
117 _gainClassData(_data){ 117 _gainClassData(_data){
118 - if(_data || _data.code == 200){ 118 + if(_data && _data.code == 200){
119 this.classDateList = _data.returnData.data; 119 this.classDateList = _data.returnData.data;
120 let classifyListContent = $('#classifyListContent'); 120 let classifyListContent = $('#classifyListContent');
121 classifyListContent.empty(); 121 classifyListContent.empty();
@@ -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 - 10 +import ErrorApe from "./ErrorApe";
11 let loger = Loger.getLoger('PC-LoginOrRegister'); 11 let loger = Loger.getLoger('PC-LoginOrRegister');
12 class LoginOrRegister extends Ape { 12 class LoginOrRegister extends Ape {
13 constructor() { 13 constructor() {
@@ -235,13 +235,16 @@ class LoginOrRegister extends Ape { @@ -235,13 +235,16 @@ class LoginOrRegister extends Ape {
235 data: signInfo, 235 data: signInfo,
236 timeout:5000, 236 timeout:5000,
237 success:function(_data){ 237 success:function(_data){
238 - console.log(_data,'成功') 238 +
239 //注册成功后 跳转登录界面 239 //注册成功后 跳转登录界面
240 if(_data && _data.code == 200){ 240 if(_data && _data.code == 200){
241 - alert('注册成功') 241 + // alert('注册成功')
  242 + console.log(_data,'成功')
  243 + ErrorApe.showWarnError('注册成功');
242 that._successSign(_data); 244 that._successSign(_data);
243 }else{ 245 }else{
244 - alert(_data.returnData.data.msg) 246 + ErrorApe.showWarnError(_data.returnData.data.msg);
  247 + // alert(_data.returnData.data.msg)
245 } 248 }
246 }, 249 },
247 error:function(error){ 250 error:function(error){
@@ -294,24 +297,27 @@ class LoginOrRegister extends Ape { @@ -294,24 +297,27 @@ class LoginOrRegister extends Ape {
294 success:function(_data){ 297 success:function(_data){
295 loger.log('登录返回数据',_data) 298 loger.log('登录返回数据',_data)
296 if(_data && _data.code == 200){ 299 if(_data && _data.code == 200){
297 - alert('登录成功') 300 + // alert('登录成功')
  301 + ErrorApe.showWarnError('登录成功');
298 ClassDataProxy.userType= _data.returnData.data.userType; 302 ClassDataProxy.userType= _data.returnData.data.userType;
299 ClassDataProxy.loginName =_name.value; 303 ClassDataProxy.loginName =_name.value;
300 ClassDataProxy.password = _passWord.value; 304 ClassDataProxy.password = _passWord.value;
301 ClassDataProxy.token =_data.returnData.data.token 305 ClassDataProxy.token =_data.returnData.data.token
302 ClassDataProxy.status = true; 306 ClassDataProxy.status = true;
303 - 307 + ClassDataProxy.id = _data.returnData.data.id;
304 308
305 window.localStorage.setItem("loginName",ClassDataProxy.loginName); 309 window.localStorage.setItem("loginName",ClassDataProxy.loginName);
306 window.localStorage.setItem("password", ClassDataProxy.password ); 310 window.localStorage.setItem("password", ClassDataProxy.password );
307 window.localStorage.setItem("userType", ClassDataProxy.userType); 311 window.localStorage.setItem("userType", ClassDataProxy.userType);
308 window.localStorage.setItem("token", ClassDataProxy.token ); 312 window.localStorage.setItem("token", ClassDataProxy.token );
309 window.localStorage.setItem('status', ClassDataProxy.status); 313 window.localStorage.setItem('status', ClassDataProxy.status);
  314 + window.localStorage.setItem('id', ClassDataProxy.id);
310 315
311 that.successLogin(); 316 that.successLogin();
312 317
313 }else{ 318 }else{
314 - alert(_data.returnData.data.msg) 319 + ErrorApe.showWarnError(_data.returnData.data.msg);
  320 + // alert(_data.returnData.data.msg)
315 } 321 }
316 }, 322 },
317 error:function(error){ 323 error:function(error){
  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-SubscribeApe');
  13 +class SubscribeApe extends Ape {
  14 + constructor() {
  15 + super();
  16 + this.id = '';
  17 + this.addEvent();
  18 + this.init();
  19 + }
  20 +
  21 + init() {
  22 + $('#lanclassContentApply').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 + }
  28 +
  29 + addEvent() {
  30 +
  31 + }
  32 + _lanclassContentApplyHandler(evt){
  33 + let that = this;
  34 + let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
  35 + let status = $(evt.currentTarget).attr('data');
  36 + let id = $('#lanclassBox').attr('data');
  37 + this.id = id;
  38 +
  39 + loger.log('显示预约信息',parseInt(status))
  40 + $.ajax({
  41 + type: "POST",
  42 + url: _url,
  43 + data:{siteId:'markettest',
  44 + "studentId":ClassDataProxy.id,
  45 + "status":parseInt(status),
  46 + "meetingId":id
  47 + },
  48 + headers: {siteId:'markettest',
  49 + 'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
  50 + success:function(_data){
  51 + let arr = ['收藏成功！','预约成功！','报名成功！']
  52 + //获取课堂数据
  53 + if(_data && _data.code == 200){
  54 + loger.log(_data,'预约信息')
  55 + ErrorApe.showWarnError(arr[status]);
  56 + }else{
  57 + that.toLogin();
  58 + }
  59 + },
  60 + error:function(error){
  61 + //alert('首页数据获取失败')
  62 + console.log(error,'首页数据获取失败')
  63 + }
  64 + })
  65 + }
  66 + toLogin(){
  67 + $('#userLoginBox').show();
  68 + }
  69 + //工具类
  70 + _format(str, obj) {
  71 + return str.replace(/\{(\w+)\}/g, function (match, group, index) {
  72 + return obj[group];
  73 + });
  74 + };
  75 +}
  76 +export default SubscribeApe;
@@ -37,6 +37,8 @@ class TeacherDetailApe extends Ape { @@ -37,6 +37,8 @@ class TeacherDetailApe extends Ape {
37 37
38 $('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页 38 $('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页
39 39
  40 + $('#teacherUI li').on('click',this._recordLiHandler.bind(this));//课堂分类
  41 +
40 42
41 } 43 }
42 44
@@ -46,10 +48,21 @@ class TeacherDetailApe extends Ape { @@ -46,10 +48,21 @@ class TeacherDetailApe extends Ape {
46 isLocalStorage(){ 48 isLocalStorage(){
47 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ 49 if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
48 $('#myCenterBox').show(); 50 $('#myCenterBox').show();
  51 + $('#teacherMyCenterName').text(ClassDataProxy.loginName);
  52 + $('.myCenterContentBox').eq(0).show();
  53 + let newDate = new Date();
  54 + let newHours = newDate.getHours();
  55 + let text = newHours>12?'下午好,':'上午好,'
  56 + $('#teacherMyCenterTime').text(text);
  57 + loger.log('老师名字',ClassDataProxy.loginName)
49 } 58 }
50 } 59 }
  60 + _recordLiHandler(evt){
  61 + let ind = $(evt.currentTarget).attr('data');
  62 + $(evt.currentTarget).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
  63 + $('.myCenterContentBox').eq(ind).show().siblings().hide();
  64 + }
51 _teacherBtnHandler(evt){ 65 _teacherBtnHandler(evt){
52 - loger.log('老师',ClassDataProxy.userType)  
53 this._clearListContent(); 66 this._clearListContent();
54 this._showLoadingImg(); 67 this._showLoadingImg();
55 let _ele = $(evt.target); 68 let _ele = $(evt.target);
@@ -57,13 +70,8 @@ class TeacherDetailApe extends Ape { @@ -57,13 +70,8 @@ class TeacherDetailApe extends Ape {
57 $('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); 70 $('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
58 } 71 }
59 $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck'); 72 $(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
60 - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){  
61 - this.teacherClickTeacher();//老师点击老师模块  
62 - }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8 || ClassDataProxy.userType == ClassDataProxy.USER_TYPE_0){  
63 - this.studentClickTeacher();//学生点击老师模块  
64 - this.detailPage();  
65 - }  
66 - 73 + this.studentClickTeacher();//学生点击老师模块
  74 + this.detailPage();
67 } 75 }
68 //点击翻页 76 //点击翻页
69 _pageNumBtnHandler(evt){ 77 _pageNumBtnHandler(evt){
@@ -114,7 +122,7 @@ class TeacherDetailApe extends Ape { @@ -114,7 +122,7 @@ class TeacherDetailApe extends Ape {
114 success:function(_data){ 122 success:function(_data){
115 loger.log('老师界面渲染数据',_data) 123 loger.log('老师界面渲染数据',_data)
116 //获取课堂数据 124 //获取课堂数据
117 - if(_data || _data.code == 200){ 125 + if(_data && _data.code == 200){
118 that._gainClassData(_data); 126 that._gainClassData(_data);
119 } 127 }
120 128
@@ -18,7 +18,9 @@ import CreateClassApe from 'ape/CreateClassApe';//创建课堂 @@ -18,7 +18,9 @@ import CreateClassApe from 'ape/CreateClassApe';//创建课堂
18 import ListDetailsApe from 'ape/ListDetailsApe';//列表详情 18 import ListDetailsApe from 'ape/ListDetailsApe';//列表详情
19 import AdministratorApe from 'ape/AdministratorApe';//管理员 19 import AdministratorApe from 'ape/AdministratorApe';//管理员
20 import MyCenterApe from 'ape/MyCenterApe';//个人中心 20 import MyCenterApe from 'ape/MyCenterApe';//个人中心
  21 +import SubscribeApe from 'ape/SubscribeApe';//预约
21 import MessageTypes from "MessageTypes"; 22 import MessageTypes from "MessageTypes";
  23 +
22 import Loger from "Loger"; 24 import Loger from "Loger";
23 let loger = Loger.getLoger('networkSchool'); 25 let loger = Loger.getLoger('networkSchool');
24 26
@@ -32,10 +34,11 @@ let _createClassApe; @@ -32,10 +34,11 @@ let _createClassApe;
32 let _listDetailsApe; 34 let _listDetailsApe;
33 let _administratorApe; 35 let _administratorApe;
34 let _myCenterApe; 36 let _myCenterApe;
  37 +let _subscribeApe;
35 38
36 class Main { 39 class Main {
37 constructor() { 40 constructor() {
38 - this.clientVersion="v1.6.5.20170904"; 41 + this.clientVersion="v1.6.6.20170904";
39 loger.warn("clientVersion:"+this.clientVersion); 42 loger.warn("clientVersion:"+this.clientVersion);
40 43
41 let locationProtocol= location.protocol; 44 let locationProtocol= location.protocol;
@@ -135,6 +138,8 @@ class Main { @@ -135,6 +138,8 @@ class Main {
135 138
136 //个人中心 139 //个人中心
137 _myCenterApe = new MyCenterApe(); 140 _myCenterApe = new MyCenterApe();
  141 + //预约管理
  142 + _subscribeApe = new SubscribeApe();
138 143
139 } 144 }
140 145
@@ -174,7 +179,11 @@ class Main { @@ -174,7 +179,11 @@ class Main {
174 //判断登录用户的状态 179 //判断登录用户的状态
175 _localStorageState(){ 180 _localStorageState(){
176 let userType = window.localStorage.getItem('userType')||0; 181 let userType = window.localStorage.getItem('userType')||0;
  182 + let loginName = window.localStorage.getItem('loginName')|| '';
  183 + let id = window.localStorage.getItem('id')|| '';
177 ClassDataProxy.userType = parseInt(userType); 184 ClassDataProxy.userType = parseInt(userType);
  185 + ClassDataProxy.loginName = loginName;
  186 + ClassDataProxy.id = id;
178 loger.log('进入课堂时显示的type值',ClassDataProxy.userType) 187 loger.log('进入课堂时显示的type值',ClassDataProxy.userType)
179 188
180 switch (parseInt(userType)){ 189 switch (parseInt(userType)){
@@ -217,6 +226,7 @@ class Main { @@ -217,6 +226,7 @@ class Main {
217 $('#androidDownload').hide(); 226 $('#androidDownload').hide();
218 $('#classManagementBox').hide(); 227 $('#classManagementBox').hide();
219 $('#classifyListBox').hide(); 228 $('#classifyListBox').hide();
  229 + $('#myCenterBox').show();
220 } 230 }
221 _student(){ 231 _student(){
222 $('#slideshow').show(); 232 $('#slideshow').show();
@@ -208,22 +208,28 @@ class ClassDataProxy { @@ -208,22 +208,28 @@ class ClassDataProxy {
208 } 208 }
209 //计算时间差值显示列表 209 //计算时间差值显示列表
210 static getTimeDifference(start,end){ 210 static getTimeDifference(start,end){
211 - 211 + let newTime = new Date();
212 let newStart = new Date(start) 212 let newStart = new Date(start)
213 let newEnd = new Date(end) 213 let newEnd = new Date(end)
214 214
215 - let day =1000*3600*24; 215 + let date = newStart.getDate() - newTime.getDate();
  216 +
  217 + let newHours = newStart.getHours();//小时
  218 + let oldHours = newEnd.getHours();
  219 + let newMonth = newStart.getMonth()+1;//月
  220 + let oldMonth = newEnd.getMonth()+1;
  221 + let newDate = newStart.getDate();//日
216 222
217 - let timer = parseInt((newEnd.getTime() - newStart.getTime()) / parseInt(day));  
218 - let newEndHours = newEnd.getHours()<10?'0'+newEnd.getHours():newEnd.getHours();  
219 - let newStartHours = newStart.getHours()<10?'0'+newStart.getHours():newStart.getHours(); 223 + let newEndHours = oldHours <10 ? '0' + oldHours : oldHours;
  224 + let newStartHours = newHours <10 ? '0' + newHours : newHours;
220 225
221 - let newStartDate = newStart.getDate()<10?'0'+newStart.getDate():newStart.getDate(); 226 + let newStartDate = newStart.getDate()+1<10?'0'+newStart.getDate():newStart.getDate();
222 let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay(); 227 let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay();
223 - if(timer == 0){ 228 +
  229 + if(date == 0){
224 return '今天 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00'; 230 return '今天 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00';
225 }else{ 231 }else{
226 - return newStartDate+1 + '月' + newStartDay +'日 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00'; 232 + return newMonth + '月' + newDate +'日 ' + ' '+newHours + ':00' + ' - ' + oldHours+':00';
227 } 233 }
228 } 234 }
229 } 235 }
@@ -258,6 +264,7 @@ ClassDataProxy.loginName =""; @@ -258,6 +264,7 @@ ClassDataProxy.loginName ="";
258 ClassDataProxy.password ="" 264 ClassDataProxy.password =""
259 ClassDataProxy.token =""; 265 ClassDataProxy.token ="";
260 ClassDataProxy.status = false; 266 ClassDataProxy.status = false;
  267 +ClassDataProxy.id = '';
261 268
262 ClassDataProxy.USER_TYPE_0 = 0; 269 ClassDataProxy.USER_TYPE_0 = 0;
263 ClassDataProxy.USER_TYPE_1 = 1; 270 ClassDataProxy.USER_TYPE_1 = 1;