董佳音 / networkSchool

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

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

内嵌 并排对比
正在显示 14 个修改的文件 包含 580 行增加 和 404 行删除
... ... @@ -273,7 +273,7 @@ body{
left:0;
right:0;
margin:0 auto;
min-height:600px;
min-height:580px;
}
/*首页*/
.box{
... ... @@ -722,6 +722,7 @@ body{
}
.liveInfoLeft{
float: left;
padding-left:15px;
}
.liveInfoLeftLi{
float: left;
... ... @@ -729,6 +730,7 @@ body{
text-align: center;
padding:0 10px;
font-size: 14px;
margin-right:15px;
cursor: pointer;
}
.liveInfoLeftLi:hover{
... ... @@ -1374,11 +1376,41 @@ body{
.removeCancel{
background: #e6e6e6;
}
/* warn警告框 */
.warnHintBox{
width:300px;
height:120px;
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
background: #fffdfd;
cursor: default;
font-size: 14px;
border-radius:4px;
box-shadow: 1px 3px 6px #adadad;
border: 1px solid #c1baba;
display: none;
}
.warnHintA{
position: absolute;
right:8px;
top:6px;
}
.warnHintContent{
width:100%;
height:120px;
line-height: 120px;
text-align: center;
}
/* warn警告框 END */
/*个人中心*/
.myCenterBox{
width:100%;
float: left;
margin:40px 15px 0 40px;
margin-top:40px;
display: none;
}
.myCenterLeftBox{
... ... @@ -1386,6 +1418,7 @@ body{
height:270px;
background: #fff;
float: left;
margin-right: 15px;
}
.recordLi2{
width: 60%;
... ... @@ -1395,6 +1428,11 @@ body{
.myCenterContentBox{
float: left;
width: 1005px;
display: none;
}
.myCenterContentBox1{
background: #fff;
margin-bottom:40px;
}
.myCenterTopLeftBox{
width:330px;
... ... @@ -1403,7 +1441,8 @@ body{
float: left;
font-size: 14px;
color: #333333;
margin:0 15px;
margin-right:15px;
margin-bottom:15px;
}
.teacherMyCenter1{
padding:30px 0 15px 30px;
... ... @@ -1421,6 +1460,7 @@ body{
.teacherMyCenterInfo{
float: left;
width: 100%;
padding-top:5px;
}
.teacherMyCenter2{
float: left;
... ... @@ -1440,7 +1480,7 @@ body{
display: inline-block;
}
.myCenterTopRightBox{
width: 600px;
width: 620px;
height: 140px;
background: #fff;
padding: 20px;
... ... @@ -1449,7 +1489,8 @@ body{
.myCenterTopRightTit{
font-size: 16px;
color: #333333;
padding-bottom:20px;
padding-bottom: 10px;
display: inline-block;
}
.teacherTodayCourseList{
font-size: 12px;
... ... @@ -1481,19 +1522,18 @@ body{
float: right;
}
.myCenterContentTitleBox{
width:985px;
width:1005px;
height:44px;
line-height: 44px;
margin:15px 0 15px 15px;
background: #fff;
font-size: 12px;
color:#666666;
float: left;
}
.myCenterContentList{
width:985px;
width:1005px;
float: left;
margin-left:15px;
margin-top:15px;
}
.classifyListMyCenter{
width: 235px;
... ... @@ -1530,4 +1570,191 @@ body{
color:#999999;
font-size: 12px;
padding-right: 5px;
}
/*个人信息*/
.oneselfTitle{
padding:25px 0 25px 15px;
margin-left:30px;
border-bottom: 1px solid #ebebeb;
font-size: 16px;
color: #333333;
display: inline-block;
width: 945px;
}
.oneselfInfoUI{
padding-bottom:20px;
}
.oneselfInfoList{
padding:30px 0 0 45px;
}
.oneselfInfoList1{
}
.oneselfInfoHeader{
font-size: 14px;
color:#999999;
width: 80px;
display: inline-block;
}
.oneselfInfoInput{
width:251px;
height: 34px;
line-height: 34px;
padding-left:5px;
border:1px solid #ebebeb;
color:#999999;
font-size: 14px;
}
.accountInfoList{
height: 85px;
margin:0 30px;
border-bottom:1px solid #ebebeb;
}
.accountInfoList1{
border:none;
}
.accountInfoIcon{
font-size: 16px;
line-height: 85px;
padding:0 20px;
color:#d95136;
float: left;
}
.accountInfoBtn{
width:76px;
height:34px;
line-height: 34px;
border:1px solid #ebebeb;
font-size: 14px;
color:#666666;
float: right;
text-align: center;
cursor: pointer;
margin-top: 25px;
margin-right: 20px;
}
.accountInfo{
float: left;
}
.significanceInfo{
font-weight: bold;
width: 100%;
float: left;
font-size: 16px;
color:#333;
padding-top:30px;
}
.significanceInfoTit{
padding-right: 20px;
}
.significanceInfoHint{
color:#999999;
font-size: 12px;
padding-top:5px;
}
.accountInfoSaveBtn{
float: right;
background: #3498db;
color:#fff;
}
.courseMinuteList{
float: left;
}
.courseMinuteListTimeTit{
height:60px;
}
.courseMinuteListTime{
font-size: 16px;
color:#666666;
line-height: 60px;
padding-right: 25px;
}
.courseMinuteListWire{
width: 866px;
height: 1px;
background: #cccccc;
margin-top: 30px;
display: inline-block;
}
.teacherCorrelatedInfoBox{
margin-top:15px;
float: left;
width: 1005px;
height:200px;
background: #fff;
}
.teacherCorrelatedInfoLeft{
width: 450px;
}
.teacherCorrelatedInfoImg{
float: left;
margin:30px 40px 0 30px;
}
.teacherCorrelatedInfo{
float: left;
width: 260px;
}
.teacherCorrelatedInfoName{
font-size: 16px;
float: left;
width: 100%;
font-weight: bold;
margin-top:30px;
}
.teacherCorrelatedInfoMajor{
font-size: 14px;
color:#999999;
width: 100%;
margin-top:10px;
float: left;
}
.teacherCorrelatedInfoCourse{
font-weight: bold;
width: 100%;
margin-top:10px;
float: left;
}
.teacherCorrelatedInfoMajorMsg{
font-size: 14px;
width: 200px;
overflow: hidden;
margin-top:10px;
text-overflow: ellipsis;
float: left;
}
.cancelReservationBtn{
width:108px;
height: 36px;
line-height: 36px;
text-align: center;
color:#333333;
border-radius: 3px;
border:1px solid #333333;
cursor: pointer;
font-size: 12px;
float: left;
margin-top:10px;
}
.teacherCorrelatedInfoCenter{
float: left;
margin-top: 20px;
}
.teacherCorrelatedInfoCenter img{
width:230px;
height: 160px;
margin-right: 20px;
float: left;
}
.teacherCorrelatedInfoBtn{
width:72px;
height: 34px;
background: #3498db;
color:#fff;
text-align: center;
line-height: 34px;
margin-right: 30px;
font-size: 14px;
border-radius: 3px;
cursor: pointer;
float: right;
margin-top:83px;
}
\ No newline at end of file
... ...
... ... @@ -119,7 +119,7 @@
<span class="lanclassContentInfoTimeStart" id="lanclassContentInfoTimeStart">开始时间：2017-08-01 13:00:00</span>
<span class="lanclassContentInfoTimeEnd" id="lanclassContentInfoTimeEnd">结束时间：2017-08-01 13:00:00</span>
</div>
<div class="lanclassContentApply btnHover" id="lanclassContentApply">我要报名</div>
<div class="lanclassContentApply btnHover" id="lanclassContentApply" data="2">我要报名</div>
</div>
<div class="lanclassContentRight">
<div class="thirdPartyIconBox">
... ... @@ -127,11 +127,11 @@
<span id="qqIcon" class="thirdPartyIcon qqIcon iconfont">&#xe605;</span>
<span id="weiboIcon" class="thirdPartyIcon weiboIcon iconfont">&#xe6eb;</span>
</div>
<div class="collectBox" id="collectYes">
<div class="collectBox" id="collectYes" data="0">
<img class="collectIcon" id="collectYesIcon" src="images/collect.png" alt="">
<span class="collectText">已收藏</span>
</div>
<div class="collectBox" id="collectNo">
<div class="collectBox" id="collectNo" data="0">
<img class="collectIcon" id="collectNoIcon" src="images/not-collect.png" alt="">
<span class="collectText">未收藏</span>
</div>
... ... @@ -197,7 +197,7 @@
授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容授课内容
</p>
</div>
<button class="teacherDetailOrderBtn btnHover" id="orderBtn">我要预约</button>
<button class="teacherDetailOrderBtn btnHover" id="orderBtn" data="1">我要预约</button>
</div>
</div>
<div class="teacherDetailContent">
... ... @@ -946,99 +946,211 @@
</div>
</div>
</div>
<!--个人中心-->
<div id="myCenterBox" class="myCenterBox">
<div class="myCenterLeftBox">
<ul class="recordUl" id="teacherUI">
<li class="recordLi recordLi2 recordLiCheck">
<li class="recordLi recordLi2 recordLiCheck" data="0">
<label for="courseManagement" class="iconfont">&#xe699;</label>
<span class="recordLiText" id="teacherHomeBtn">首页</span>
</li>
<li class="recordLi recordLi2">
<li class="recordLi recordLi2" data="1">
<label for="createClassBtn" class="iconfont">&#xe69a;</label>
<span class="recordLiText" id="teacherCoursesBtn">我的课程</span>
</li>
<li class="recordLi recordLi2">
<li class="recordLi recordLi2" data="2">
<label for="classManagement" class="iconfont">&#xe6a4;</label>
<span class="recordLiText" id="teacherOrderBtn">我的预约</span>
</li>
<li class="recordLi recordLi2">
<li class="recordLi recordLi2" data="3">
<label for="personManagement" class="iconfont">&#xe6a1;</label>
<span class="recordLiText" id="teacherSetBtn">个人设置</span>
</li>
</ul>
</div>
<div class="myCenterContentBox">
<div class="myCenterTopLeftBox">
<div class="teacherMyCenter1">
<img class="teacherMyCenterImg" src="images/u373.png" alt="">
<p class="teacherMyCenterInfoBox">
<span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span>
<span class="teacherMyCenterInfo" id="teacherMyCenterName">小明同学</span>
</p>
<div class="myCenterContentBoxAll">
<!--个人中心主页-->
<div class="myCenterContentBox">
<div class="myCenterTopLeftBox">
<div class="teacherMyCenter1">
<img class="teacherMyCenterImg" src="images/u373.png" alt="">
<p class="teacherMyCenterInfoBox">
<span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span>
<span class="teacherMyCenterInfo" id="teacherMyCenterName">小明同学</span>
</p>
</div>
<div class="teacherMyCenter2">
<label class="teacherMyCenterTitle">学习时长：</label>
<span class="learningTime">20小时08分钟</span>
</div>
<div class="teacherMyCenter2">
<label class="teacherMyCenterTitle">安全等级：</label>
<div class="teacherGradeImgBox">
<img class="teacherGradeImg" src="images/collect.png" alt="">
<img class="teacherGradeImg" src="images/collect.png" alt="">
<img class="teacherGradeImg" src="images/collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
</div>
</div>
</div>
<div class="teacherMyCenter2">
<label class="teacherMyCenterTitle">学习时长：</label>
<span class="learningTime">20小时08分钟</span>
<div class="myCenterTopRightBox">
<label class="myCenterTopRightTit">今日课程</label>
<ul>
<li class="teacherTodayCourseList">
<span class="courseDetailInfo">《初中英语（上）》</span>
<span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">00:09:10</i></span>
<button class="teacherEnterClass btnHover">立即进入</button>
</li>
<li class="teacherTodayCourseList">
<span class="courseDetailInfo">《初中英语（上）》</span>
<span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">02:09:10</i></span>
<button class="teacherEnterClass btnHover">立即进入</button>
</li>
</ul>
</div>
<div class="teacherMyCenter2">
<label class="teacherMyCenterTitle">安全等级：</label>
<div class="teacherGradeImgBox">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<img class="teacherGradeImg" src="images/not-collect.png" alt="">
<div class="myCenterContentTitleBox">
<div class="liveInfoLeft" id="teacherInfoList">
<div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div>
<div class="liveInfoLeftLi">未开始</div>
<div class="liveInfoLeftLi">已结束</div>
</div>
</div>
</div>
<div class="myCenterTopRightBox">
<label class="myCenterTopRightTit">今日课程</label>
<ul>
<li class="teacherTodayCourseList">
<span class="courseDetailInfo">《初中英语（上）》</span>
<span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">00:09:10</i></span>
<button class="teacherEnterClass btnHover">立即进入</button>
</li>
<li class="teacherTodayCourseList">
<span class="courseDetailInfo">《初中英语（上）》</span>
<span class="courseDetailInfo1">距开始还有：<i class="teacherStartContent">00:09:10</i></span>
<button class="teacherEnterClass btnHover">立即进入</button>
</li>
</ul>
</div>
<div class="myCenterContentTitleBox">
<div class="liveInfoLeft" id="teacherInfoList">
<div class="liveInfoLeftLi liveInfoLeftLiCheck">正在直播</div>
<div class="liveInfoLeftLi">未开始</div>
<div class="liveInfoLeftLi">已结束</div>
<div class="myCenterContentList">
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
</div>
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
</div>
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
</div>
</div>
</div>
<div class="myCenterContentList">
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
<!--我的课程-->
<div class="myCenterContentBox">
<div class="myCenterContentTitleBox studyContent">
<div class="liveInfoLeft" id="courseInfoList">
<div class="liveInfoLeftLi liveInfoLeftLiCheck">待学习</div>
<div class="liveInfoLeftLi">已学完</div>
<div class="liveInfoLeftLi">收藏</div>
</div>
</div>
<div class="courseMinuteList">
<div class="courseMinuteListTimeTit">
<span class="courseMinuteListTime">2017-09-04</span>
<span class="courseMinuteListWire"></span>
</div>
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u374.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
</div>
</div>
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
</div>
<!--我的预约-->
<div class="myCenterContentBox">
<div class="myCenterContentTitleBox studyContent">
<div class="liveInfoLeft" id="subscribeList">
<div class="liveInfoLeftLi liveInfoLeftLiCheck">课程</div>
<div class="liveInfoLeftLi">老师</div>
</div>
</div>
<div class="classifyListMyCenter">
<img class="myCenterContentListImg" src="images/u373.png" alt="">
<p class="myCenterContentListTit">初一英语阅读理解习题课</p>
<p class="myCenterContentListTit1">主讲人：方圆</p>
<p class="myCenterContentMin">45min</p>
<span class="myCenterContentTimer">2016-09-12</span>
<div class="teacherCorrelatedInfoBox">
<div class="teacherCorrelatedInfoLeft">
<img class="teacherCorrelatedInfoImg" id="teacherCorrelatedInfoImg" src="images/u293.png" alt="">
<div class="teacherCorrelatedInfo">
<b class="teacherCorrelatedInfoName" id="teacherCorrelatedInfoName">张媛媛</b>
<b class="teacherCorrelatedInfoMajor">北京市|少儿英语</b>
<b class="teacherCorrelatedInfoCourse">课程:50</b>
<span class="teacherCorrelatedInfoMajorMsg">毕业于外国语学院，专业8级</span>
<p class="cancelReservationBtn" id="cancelReservationBtn">取消预约</p>
</div>
</div>
<div class="teacherCorrelatedInfoCenter">
<img src="images/u374.png" alt="">
<img src="images/u374.png" alt="">
</div>
<div class="teacherCorrelatedInfoBtn">更多课程</div>
</div>
</div>
<!--个人信息-->
<div class="myCenterContentBox myCenterContentBox1">
<label class="oneselfTitle">个人信息</label>
<ul class="oneselfInfoUI">
<li class="oneselfInfoList oneselfInfoList1">
<label class="oneselfInfoHeader">头像</label>
<img src="images/u293.png" alt="">
</li>
<li class="oneselfInfoList">
<label class="oneselfInfoHeader">登录名</label>
<input class="oneselfInfoInput" id="oneselfInfoLoginName" placeholder="yangyangyag" type="text">
</li>
<li class="oneselfInfoList">
<label class="oneselfInfoHeader">姓名</label>
<input class="oneselfInfoInput" id="oneselfInfoUserName" placeholder="洋洋" type="text">
</li>
<li class="oneselfInfoList">
<label class="oneselfInfoHeader">性别</label>
<input class="allowPublic allowPublicDetail" id="oneselfInfoMan" name="videoQuality" type="radio" value="0" checked="checked">
<label for="oneselfInfoMan">
男
</label>
<input class="allowPublic allowPublicDetail" id="oneselfInfoWoman" name="videoQuality" type="radio" value="1">
<label for="oneselfInfoWoman">
女
</label>
</li>
</ul>
<label class="oneselfTitle">账户信息</label>
<ul class="accountInfoUI">
<li class="accountInfoList">
<label class="accountInfoIcon">&#xe6a8;</label>
<div class="accountInfo">
<span class="significanceInfo"><label>账号密码</label></span>
<span class="significanceInfoHint">用于保护账号信息和登录安全</span>
</div>
<span class="accountInfoBtn">修改</span>
</li>
<li class="accountInfoList">
<label class="accountInfoIcon">&#xe6a6;</label>
<div class="accountInfo">
<span class="significanceInfo"><label class="significanceInfoTit">安全邮箱</label><label id="setMail">hi*****n@3mang.com</label></span>
<span class="significanceInfoHint">用于保护账号信息和登录安全</span>
</div>
<span class="accountInfoBtn">修改</span>
</li>
<li class="accountInfoList">
<label class="accountInfoIcon">&#xe6a7;</label>
<div class="accountInfo">
<span class="significanceInfo"><label class="significanceInfoTit">安全手机</label><label id="setPhone">139*****168</label></span>
<span class="significanceInfoHint">用于保护账号信息和登录安全</span>
</div>
<span class="accountInfoBtn">修改</span>
</li>
<li class="accountInfoList accountInfoList1">
<button class="accountInfoBtn accountInfoSaveBtn" id="accountInfoSaveBtn">保存</button>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="footerBg">
<div class="footer">
... ... @@ -1160,5 +1272,10 @@
</div>
</div>
</div>
<!--warn提示信息-->
<div class="warnHintBox" id="warnHintBox">
<a href="javascript: void(0)" class="warnHintA iconfont" id="warnHintA">&#xe638;</a>
<p class="warnHintContent" id="warnHintContent"></p>
</div>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -48,7 +48,7 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor=
<a id="{_musicInd}" class="classHandlePort" href="">伴音</a>
<a id="{_updateInd}" class="classHandlePort" href="">修改</a>
<a id="{_removeInd}" class="classHandlePort" href="">删除</a>
<a id="{_joinInd}" class="classHandlePort" href="">加入课堂</a>
<a id="{_joinInd}" class="classHandlePort" data="{_esenglish}" href="###">加入课堂</a>
</td>
</tr>
`;
... ... @@ -73,6 +73,8 @@ class AdministratorApe extends Ape {
$('#classHandlerDownPage').on('click',this._downPageHandler.bind(this));//下页
$('#classHandlerEndPage').on('click',this._endPageHandler.bind(this));//尾页
$('#classHandlerSpecificPage').on('click',this._assignPageHandler.bind(this));//指定页
$('#courseContent').on('click','.classHandlePort',this._classHandlePortHandler.bind(this));//加入课堂
}
addEvent() {
... ... @@ -114,7 +116,11 @@ class AdministratorApe extends Ape {
this._pageNumBtnHandler(parseInt(inputVal));
}
}
_classHandlePortHandler(evt){
let id = $(evt.target).attr('data');
loger.log(id,11111111111)
// window.open('/3m/attend.do?meetingNumber=' + id);
}
//点击翻页
_pageNumBtnHandler(ind){
let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/getMeeting';
... ...
... ... @@ -16,35 +16,12 @@ class ErrorApe extends Ape {
}
init(){
$('.errorFlashHintA').on('click',this._hideErrorHintHandler.bind(this));
$('.errorSetFlashHintB').on('click',this._showErrorDetectionFlashParticular.bind(this));
//各浏览器设置信息跳转
$('#e_speed360').on('click',this._skipNewWindow.bind(this));
$('#e_chrome').on('click',this._skipNewWindow.bind(this));
$('#e_firefox').on('click',this._skipNewWindow.bind(this));
$('#e_ie10').on('click',this._skipNewWindow.bind(this));
$('#e_security360').on('click',this._skipNewWindow.bind(this));
$('#e_2345').on('click',this._skipNewWindow.bind(this));
$('#e_qq').on('click',this._skipNewWindow.bind(this));
$('#e_sogou').on('click',this._skipNewWindow.bind(this));
$('#e_safari').on('click',this._skipNewWindow.bind(this));
//警告框warn 关闭事件
$('#warnHintA').on('click',this._hideWarnError.bind(this));
}
show(){
$('.errorHintBox').show();
}
hide(){
$('.errorHintBox').hide();
$('#publicChoiceErrorrBox').hide();
}
_hideErrorHintHandler(evt){
let parents = $(evt.target).parents('.errorHint');
parents.attr('data','');
parents.hide();
this.judgeDisplayStatus();
_hideWarnError(){
clearTimeout(this._isTime);
$('#warnHintBox').hide();
}
//关闭warn提示框
_hideWarnError(){
... ... @@ -62,97 +39,8 @@ class ErrorApe extends Ape {
this.hide();
}
}
showError(_type,_msg,_callback){
this.show();
switch (_type){
case ErrorApe.TYPE_1:
//显示直播兼容浏览器
this.showErrorTestLive();
break;
case ErrorApe.TYPE_2:
//显示回放兼容浏览器
this.showErrorPlayback();
break;
case ErrorApe.TYPE_3:
//公用的弹出框
this.showPublicError(_msg);
break;
/* case ErrorApe.TYPE_4:
this.showErrorCamera(_msg);
break;
case ErrorApe.TYPE_5:
this.showErrorOccupyMicrophone(_msg);
break;
case ErrorApe.TYPE_6:
this.showErrorOccupyCamera(_msg);
break;*/
case ErrorApe.TYPE_7:
break;
case ErrorApe.TYPE_8:
//下载flash
this.showErrorDetectionFlash(_msg,true);
break;
case ErrorApe.TYPE_9:
//设置浏览器的flash使用权限
this.showErrorDetectionFlash(_msg,false);
break;
case ErrorApe.TYPE_10:
//safari falsh 提示开启权限
this.showErrorSafariFlash();
break;
case ErrorApe.TYPE_11:
//QQ Chrome falsh 提示开启权限
this.showErrorQQOrChromeFlash();
break;
case ErrorApe.TYPE_12:
//搜狗 360极速 falsh 提示开启权限
this.showErrorSougouOr360jisuFlash();
break;
case ErrorApe.TYPE_13:
//开启chrome flash权限
this.showSetChromeFlash();
break;
case ErrorApe.TYPE_14:
//开启Firefox flash权限
this.showSetFirefoxFlash();
break;
case ErrorApe.TYPE_15:
//开启QQ flash权限
this.showSetQQFlash();
break;
case ErrorApe.TYPE_16:
//开启2345 flash权限
this.showSet2345Flash();
break;
case ErrorApe.TYPE_17:
//开启360安全 flash权限
this.showSet360anquanFlash();
break;
case ErrorApe.TYPE_18:
//开启极速 flash权限
this.showSet360jisuFlash();
break;
case ErrorApe.TYPE_19:
//开启搜狗 flash权限
this.showSetsougouFlash();
break;
case ErrorApe.TYPE_20:
//显示询问弹框
this.showPublicChoiceErrorrBox(_msg,_callback);
break;
case ErrorApe.TYPE_23:
this.showErrorPublic(_msg);
break;
case ErrorApe.TYPE_24:
this.showNetworkDisconnection(_msg);
break;
default:
this.hide();
break;
}
}
//显示warn提示框 倒计时结束自动关闭盒子
showWarnError(_msg,_time=5){
showWarnError(_msg,_time=3){
clearTimeout(this._isTime);
$('#warnHintBox').show();
$('#warnHintContent').html(_msg);
... ... @@ -162,182 +50,11 @@ class ErrorApe extends Ape {
},time)
}
//各个盒子的显示
//显示直播兼容浏览器
showErrorTestLive(){
$('.errorTestLive').show().attr('data','open');
}
//显示回放兼容浏览器
showErrorPlayback(){
$('.errorPlayback').show().attr('data','open');
}
//公用的弹出框
showPublicError(_msg){
$('.publicErrorBox').show().attr('data','open');
$('.publicErrorBox').find('.errorPublicHintContent').html(_msg);
}
showErrorCamera(_msg){
$('.notCamera').show().attr('data','open');
$('.notCamera').find('.errorHintContent').html(_msg);
}
showErrorOccupyMicrophone(_msg){
$('.occupyMicrophone').show().attr('data','open');
$('.occupyMicrophone').find('.errorHintContent').html(_msg);
}
showErrorOccupyCamera(_msg){
$('.publicErrorBox').show().attr('data','open');
$('.publicErrorBox').find('.errorHintContent').html(_msg);
}
//设备中没有检测到flash/flash被禁用
showErrorDetectionFlash(_msg,_isDownload=false){
$('#notDetectionFlash').show().attr('data','open');
if(_isDownload==true){
//显示下载flash
$('#flashDetailSteps').hide();
$('#flashUpdataVersions').show();
}else {
//显示浏览器设置flash
$('#flashDetailSteps').show();
$('#flashUpdataVersions').hide();
}
}
_showErrorDetectionFlashParticular(){
$('.notDetectionFlash').hide().attr('data','');
$('.notDetectionFlash_1').show().attr('data','open');
}
//设备中的flash版本过低,提示信息
showErrorVersionsFlash(){
$('.versionsFlash').show().attr('data','open');
}
//safari falsh 提示开启权限
showErrorSafariFlash(){
$('.safariFlashBan').show().attr('data','open');
}
//QQ Chrome falsh 提示开启权限
showErrorQQOrChromeFlash(){
$('.QQOrChromeFlashBan').show().attr('data','open');
}
//搜狗 360极速 falsh 提示开启权限
showErrorSougouOr360jisuFlash(){
$('.sougouOr360jisuFlashBan').show().attr('data','open');
}
//开启chrome flash权限
showSetChromeFlash(){
$('.setChromeFlash').show().attr('data','open');
}
//开启Firefox flash权限
showSetFirefoxFlash(){
$('.setFirefoxFlash').show().attr('data','open');
}
//开启QQ flash权限
showSetQQFlash(){
$('.setQQFlash').show().attr('data','open');
}
//开启2345 flash权限
showSet2345Flash(){
$('.set2345Flash').show().attr('data','open');
}
//开启360安全 flash权限
showSet360anquanFlash(){
$('.set360anquanFlash').show().attr('data','open');
}
//开启360极速 flash权限
showSet360jisuFlash(){
$('.set360jisuFlash').show().attr('data','open');
}
//开启搜狗 flash权限
showSetsougouFlash(){
$('.setsougouFlash').show().attr('data','open');
}
showCloseEndClass(_msg,_callback){
//$('.endClassHint').show().attr('data','open');
//if(_callback){
// $('.endClassHint').hide().attr('data','');
//}
this.showPublicChoiceErrorrBox(_msg,_callback);
}
showCloseExitClass(_msg,_callback){
//$('.exitClassHint').show().attr('data','open');
//if(_callback){
// $('.exitClassHint').hide().attr('data','');
//}
this.showPublicChoiceErrorrBox(_msg,_callback);
}
showCloseEndShare(_msg,_callback){
//$('.endShareHint').show().attr('data','open');
//if(_callback){
// $('.endShareHint').hide().attr('data','');
//}
this.showPublicChoiceErrorrBox(_msg,_callback);
}
showErrorPublic(_msg){
$('.errorPublicHint').show().attr('data','open');
$('.errorPublicHint').find('.errorPublicHintContent').html(_msg);
}
showNetworkDisconnection(_msg,_callback){
$('.networkDisconnection').show().attr('data','open');
$('.networkDisconnection').find('.errornetworkHintContent').html(_msg);
//if(_callback){
// $('.networkDisconnection').hide().attr('data','');
// this.judgeDisplayStatus();
//}
}
//显示有确定和取消按钮的提示框
showPublicChoiceErrorrBox(_msg,_callback){
$('#publicChoiceErrorrBox').show();
$('#choiceHintBoxText').html(_msg);
$('#choiceConfirm').off("click");
$('#choiceCancel').off("click");
let _this=this;
$('#choiceConfirm').on("click",function(){
_this.hide();
if(_callback){
_callback(true);
}
});
$('#choiceCancel').on("click",function(){
_this.hide();
if(_callback){
_callback(false);
}
});
}
//各刘拉你设置flash跳转
_skipNewWindow(evt){
let _id = $(evt.target).attr('id');
window.open(this.PATH + '/' + this.language + '/' + _id + '.html');
}
}
ErrorApe.prototype.TYPE_1=ErrorApe.TYPE_1=1;//兼容直播课堂的浏览器
ErrorApe.prototype.TYPE_2=ErrorApe.TYPE_2=2;//兼容录制回放的浏览器
ErrorApe.prototype.TYPE_3=ErrorApe.TYPE_3=3;//没有麦克风
/*ErrorApe.TYPE_4=4;//没有摄像头
ErrorApe.TYPE_5=5;//麦克风被占用
ErrorApe.TYPE_6=6;//摄像头被占用*/
ErrorApe.prototype.TYPE_7=ErrorApe.TYPE_7=7;//摄像头和麦克风权限
ErrorApe.prototype.TYPE_8=ErrorApe.TYPE_8=8;//没有安装flash
ErrorApe.prototype.TYPE_9=ErrorApe.TYPE_9=9;//flash版本过低
ErrorApe.prototype.TYPE_10=ErrorApe.TYPE_10=10;//flash被禁用 safari
ErrorApe.prototype.TYPE_11=ErrorApe.TYPE_11=11;//flash被禁用 QQ 谷歌
ErrorApe.prototype.TYPE_12=ErrorApe.TYPE_12=12;//flash被禁用 搜狗 360极速
ErrorApe.prototype.TYPE_13=ErrorApe.TYPE_13=13;//flash被禁用 点击拒绝 谷歌
ErrorApe.prototype.TYPE_14=ErrorApe.TYPE_14=14;//flash被禁用 点击拒绝 火狐
ErrorApe.prototype.TYPE_15=ErrorApe.TYPE_15=15;//flash被禁用 点击拒绝 QQ
ErrorApe.prototype.TYPE_16=ErrorApe.TYPE_16=16;//flash被禁用 点击拒绝 2345
ErrorApe.prototype.TYPE_17=ErrorApe.TYPE_17=17;//flash被禁用 点击拒绝 360安全
ErrorApe.prototype.TYPE_18=ErrorApe.TYPE_18=18;//flash被禁用 点击拒绝 360极速
ErrorApe.prototype.TYPE_19=ErrorApe.TYPE_19=19;//flash被禁用 点击拒绝 搜狗
ErrorApe.prototype.TYPE_20=ErrorApe.TYPE_20=20;//结束课堂提示信息
ErrorApe.prototype.TYPE_21=ErrorApe.TYPE_21=21;//退出课堂提示信息
ErrorApe.prototype.TYPE_22=ErrorApe.TYPE_22=22;//屏幕共享提示信息
ErrorApe.prototype.TYPE_23=ErrorApe.TYPE_23=23;//错误提示信息
ErrorApe.prototype.TYPE_24=ErrorApe.TYPE_24=24;//显示退出课堂
ErrorApe.prototype.language=ErrorApe.language="zh_cn";//设置默认语言为中文
... ...
... ... @@ -46,9 +46,7 @@ class HomeApe extends Ape {
}
isLocalStorage(){
if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_0 || ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){
this.detailPage();
}
this.detailPage();
}
_judgeListPlace(){
let i;
... ... @@ -76,7 +74,7 @@ class HomeApe extends Ape {
success:function(_data){
// loger.log(_data,'成功')
//获取课堂数据
if(_data || _data.code == 200){
if(_data && _data.code == 200){
that._gainClassData(_data.returnData.data);
}
},
... ... @@ -98,7 +96,7 @@ class HomeApe extends Ape {
success:function(_data){
// loger.log(_data,'成功')
//获取课堂数据
if(_data || _data.code == 200){
if(_data && _data.code == 200){
that._gainClassData(_data.returnData.data);
}
},
... ... @@ -132,6 +130,7 @@ class HomeApe extends Ape {
teacherIntro.empty();
if(_data){
let _dataList = _data.meetingInfo;
loger.log('显示当前时间',_dataList[0])
for(let i = 0;i<_dataList.length;i++){
if(i<8){
let j = (i%4)==3;
... ...
... ... @@ -115,7 +115,7 @@ class LanclassApe extends Ape {
})
}
_gainClassData(_data){
if(_data || _data.code == 200){
if(_data && _data.code == 200){
this.classDateList = _data.returnData.data;
let classifyListContent = $('#classifyListContent');
classifyListContent.empty();
... ...
... ... @@ -13,11 +13,12 @@ class ListDetailsApe extends Ape {
super();
this.addEvent();
this.isDate = 0;
this._id = '';
this.init();
}
init() {
$('#themeBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));
$('#themeBox ').on('click','.classifyList',this._curriculumListHandler.bind(this));//详情页
$('#collectYes ').on('click',this._collectYesHandler.bind(this));
$('#collectNo ').on('click',this._collectNoHandler.bind(this));
}
... ... @@ -28,6 +29,7 @@ class ListDetailsApe extends Ape {
_curriculumListHandler(evt){
$('#slideshow').hide();
let _id = evt.currentTarget.id;
this._id = _id;
let isDate = $(evt.currentTarget).attr('data');
this.isDate = isDate;
this.detailPage(_id);
... ... @@ -58,7 +60,7 @@ class ListDetailsApe extends Ape {
data:signInfo,
success:function(_data){
//获取课堂数据
if(_data || _data.code == 200){
if(_data && _data.code == 200){
that._gainClassData(_data);
}
},
... ... @@ -72,6 +74,7 @@ class ListDetailsApe extends Ape {
this._classDateContent(_data.returnData.data);
}
_classDateContent(_data){
loger.log('进入详细页显示信息',_data)
let _dataList = _data.meetingInfo[0];
if(this.isDate){
this._lanclassRender(_dataList);
... ... @@ -85,7 +88,7 @@ class ListDetailsApe extends Ape {
$('#defaultBox').hide();
$('.curriculumBox').hide();
$('#teacherDetailBox').show();
$('#teacherDetailBox').attr('data',this._id);
$('#teacherDetailInfoImg').attr('src','images/u293.png');//老师授课标题图片
$('#teacherDetailInfoDetailName').text(_dataList.userName);//老师名字
$('#teacherDetailInfoDetailSex').text();//老师性别
... ... @@ -106,11 +109,11 @@ class ListDetailsApe extends Ape {
$('#defaultBox').hide();
$('.curriculumBox').hide();
$('#lanclassBox').show();
$('#lanclassBox').attr('data',this._id);
$('#lanclassContentCover').attr('src','images/u373.png');//老师授课标题图片
$('#lanclassContentTitle').text();//老师授课标题
$('#lanclassContentTitle').text(_dataList.meetingName);//老师授课标题
$('#lanclassContentInfoPortrait').text();//老师授课老师头像
$('#lanclassContentInfoName').text();//老师授课老师名字
$('#lanclassContentInfoName').text(_dataList.create_user);//老师授课老师名字
$('#lanclassContentInfoTimeStart').text(_dataList.createTime);//老师授课开始时间
$('#lanclassContentInfoTimeEnd').text(_dataList.endTime);//老师授课结束时间
$('#collectYes');//老师授课是否收藏
... ...
... ... @@ -115,7 +115,7 @@ class LanclassApe extends Ape {
})
}
_gainClassData(_data){
if(_data || _data.code == 200){
if(_data && _data.code == 200){
this.classDateList = _data.returnData.data;
let classifyListContent = $('#classifyListContent');
classifyListContent.empty();
... ...
... ... @@ -7,7 +7,7 @@ import Ape from "./Ape";
import $ from "jquery";
import ClassDataProxy from "proxy/ClassDataProxy";
import MessageTypes from "../MessageTypes";
import ErrorApe from "./ErrorApe";
let loger = Loger.getLoger('PC-LoginOrRegister');
class LoginOrRegister extends Ape {
constructor() {
... ... @@ -235,13 +235,16 @@ class LoginOrRegister extends Ape {
data: signInfo,
timeout:5000,
success:function(_data){
console.log(_data,'成功')
//注册成功后 跳转登录界面
if(_data && _data.code == 200){
alert('注册成功')
// alert('注册成功')
console.log(_data,'成功')
ErrorApe.showWarnError('注册成功');
that._successSign(_data);
}else{
alert(_data.returnData.data.msg)
ErrorApe.showWarnError(_data.returnData.data.msg);
// alert(_data.returnData.data.msg)
}
},
error:function(error){
... ... @@ -294,24 +297,27 @@ class LoginOrRegister extends Ape {
success:function(_data){
loger.log('登录返回数据',_data)
if(_data && _data.code == 200){
alert('登录成功')
// alert('登录成功')
ErrorApe.showWarnError('登录成功');
ClassDataProxy.userType= _data.returnData.data.userType;
ClassDataProxy.loginName =_name.value;
ClassDataProxy.password = _passWord.value;
ClassDataProxy.token =_data.returnData.data.token
ClassDataProxy.status = true;
ClassDataProxy.id = _data.returnData.data.id;
window.localStorage.setItem("loginName",ClassDataProxy.loginName);
window.localStorage.setItem("password", ClassDataProxy.password );
window.localStorage.setItem("userType", ClassDataProxy.userType);
window.localStorage.setItem("token", ClassDataProxy.token );
window.localStorage.setItem('status', ClassDataProxy.status);
window.localStorage.setItem('id', ClassDataProxy.id);
that.successLogin();
}else{
alert(_data.returnData.data.msg)
ErrorApe.showWarnError(_data.returnData.data.msg);
// alert(_data.returnData.data.msg)
}
},
error:function(error){
... ...
//*
// 首页模块
// */
import Loger from "../Loger";
import Ape from "./Ape";
import $ from "jquery";
import ClassDataProxy from "proxy/ClassDataProxy";
import MessageTypes from "../MessageTypes";
import ErrorApe from "./ErrorApe";
let loger = Loger.getLoger('PC-SubscribeApe');
class SubscribeApe extends Ape {
constructor() {
super();
this.id = '';
this.addEvent();
this.init();
}
init() {
$('#lanclassContentApply').on('click',this._lanclassContentApplyHandler.bind(this));//我要报名
$('#orderBtn').on('click',this._lanclassContentApplyHandler.bind(this));//我要预约
$('#collectYes').on('click',this._lanclassContentApplyHandler.bind(this));//取消收藏
$('#collectNo').on('click',this._lanclassContentApplyHandler.bind(this));//收藏
}
addEvent() {
}
_lanclassContentApplyHandler(evt){
let that = this;
let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/studentMeeting/addStudentMeeting';
let status = $(evt.currentTarget).attr('data');
let id = $('#lanclassBox').attr('data');
this.id = id;
loger.log('显示预约信息',parseInt(status))
$.ajax({
type: "POST",
url: _url,
data:{siteId:'markettest',
"studentId":ClassDataProxy.id,
"status":parseInt(status),
"meetingId":id
},
headers: {siteId:'markettest',
'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IlhXQnJlRU00T0swYTVqUUIyUTFicGtObHlxOUFWbXZkIiwibmFtZSI6ImFkbWluIiwiY29kZSI6MSwiaWF0IjoxNTAzNDUxODU0LCJleHAiOjIyODEwNTE4NTR9.3kTVzKd_jbP7l69nxOpNaFeSjVnnjZkagYMzRB8fjNo'},
success:function(_data){
let arr = ['收藏成功！','预约成功！','报名成功！']
//获取课堂数据
if(_data && _data.code == 200){
loger.log(_data,'预约信息')
ErrorApe.showWarnError(arr[status]);
}else{
that.toLogin();
}
},
error:function(error){
//alert('首页数据获取失败')
console.log(error,'首页数据获取失败')
}
})
}
toLogin(){
$('#userLoginBox').show();
}
//工具类
_format(str, obj) {
return str.replace(/\{(\w+)\}/g, function (match, group, index) {
return obj[group];
});
};
}
export default SubscribeApe;
\ No newline at end of file
... ...
... ... @@ -37,6 +37,8 @@ class TeacherDetailApe extends Ape {
$('#classifyListBox').on('click','.pageNumBtn',this._pageNumBtnHandler.bind(this));//点击翻页
$('#teacherUI li').on('click',this._recordLiHandler.bind(this));//课堂分类
}
... ... @@ -46,10 +48,21 @@ class TeacherDetailApe extends Ape {
isLocalStorage(){
if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
$('#myCenterBox').show();
$('#teacherMyCenterName').text(ClassDataProxy.loginName);
$('.myCenterContentBox').eq(0).show();
let newDate = new Date();
let newHours = newDate.getHours();
let text = newHours>12?'下午好,':'上午好,'
$('#teacherMyCenterTime').text(text);
loger.log('老师名字',ClassDataProxy.loginName)
}
}
_recordLiHandler(evt){
let ind = $(evt.currentTarget).attr('data');
$(evt.currentTarget).addClass('recordLiCheck').siblings().removeClass('recordLiCheck');
$('.myCenterContentBox').eq(ind).show().siblings().hide();
}
_teacherBtnHandler(evt){
loger.log('老师',ClassDataProxy.userType)
this._clearListContent();
this._showLoadingImg();
let _ele = $(evt.target);
... ... @@ -57,13 +70,8 @@ class TeacherDetailApe extends Ape {
$('.header_listMsg').eq(_ele.attr('data')).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
}
$(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
this.teacherClickTeacher();//老师点击老师模块
}else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8 || ClassDataProxy.userType == ClassDataProxy.USER_TYPE_0){
this.studentClickTeacher();//学生点击老师模块
this.detailPage();
}
this.studentClickTeacher();//学生点击老师模块
this.detailPage();
}
//点击翻页
_pageNumBtnHandler(evt){
... ... @@ -114,7 +122,7 @@ class TeacherDetailApe extends Ape {
success:function(_data){
loger.log('老师界面渲染数据',_data)
//获取课堂数据
if(_data || _data.code == 200){
if(_data && _data.code == 200){
that._gainClassData(_data);
}
... ...
... ... @@ -18,7 +18,9 @@ import CreateClassApe from 'ape/CreateClassApe';//创建课堂
import ListDetailsApe from 'ape/ListDetailsApe';//列表详情
import AdministratorApe from 'ape/AdministratorApe';//管理员
import MyCenterApe from 'ape/MyCenterApe';//个人中心
import SubscribeApe from 'ape/SubscribeApe';//预约
import MessageTypes from "MessageTypes";
import Loger from "Loger";
let loger = Loger.getLoger('networkSchool');
... ... @@ -32,10 +34,11 @@ let _createClassApe;
let _listDetailsApe;
let _administratorApe;
let _myCenterApe;
let _subscribeApe;
class Main {
constructor() {
this.clientVersion="v1.6.5.20170904";
this.clientVersion="v1.6.6.20170904";
loger.warn("clientVersion:"+this.clientVersion);
let locationProtocol= location.protocol;
... ... @@ -135,6 +138,8 @@ class Main {
//个人中心
_myCenterApe = new MyCenterApe();
//预约管理
_subscribeApe = new SubscribeApe();
}
... ... @@ -174,7 +179,11 @@ class Main {
//判断登录用户的状态
_localStorageState(){
let userType = window.localStorage.getItem('userType')||0;
let loginName = window.localStorage.getItem('loginName')|| '';
let id = window.localStorage.getItem('id')|| '';
ClassDataProxy.userType = parseInt(userType);
ClassDataProxy.loginName = loginName;
ClassDataProxy.id = id;
loger.log('进入课堂时显示的type值',ClassDataProxy.userType)
switch (parseInt(userType)){
... ... @@ -217,6 +226,7 @@ class Main {
$('#androidDownload').hide();
$('#classManagementBox').hide();
$('#classifyListBox').hide();
$('#myCenterBox').show();
}
_student(){
$('#slideshow').show();
... ...
... ... @@ -208,22 +208,28 @@ class ClassDataProxy {
}
//计算时间差值显示列表
static getTimeDifference(start,end){
let newTime = new Date();
let newStart = new Date(start)
let newEnd = new Date(end)
let day =1000*3600*24;
let date = newStart.getDate() - newTime.getDate();
let newHours = newStart.getHours();//小时
let oldHours = newEnd.getHours();
let newMonth = newStart.getMonth()+1;//月
let oldMonth = newEnd.getMonth()+1;
let newDate = newStart.getDate();//日
let timer = parseInt((newEnd.getTime() - newStart.getTime()) / parseInt(day));
let newEndHours = newEnd.getHours()<10?'0'+newEnd.getHours():newEnd.getHours();
let newStartHours = newStart.getHours()<10?'0'+newStart.getHours():newStart.getHours();
let newEndHours = oldHours <10 ? '0' + oldHours : oldHours;
let newStartHours = newHours <10 ? '0' + newHours : newHours;
let newStartDate = newStart.getDate()<10?'0'+newStart.getDate():newStart.getDate();
let newStartDate = newStart.getDate()+1<10?'0'+newStart.getDate():newStart.getDate();
let newStartDay = newStart.getDay()<10?'0'+newStart.getDay():newStart.getDay();
if(timer == 0){
if(date == 0){
return '今天 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00';
}else{
return newStartDate+1 + '月' + newStartDay +'日 ' + ' '+newStartHours + ':00' + ' - ' + newEndHours+':00';
return newMonth + '月' + newDate +'日 ' + ' '+newHours + ':00' + ' - ' + oldHours+':00';
}
}
}
... ... @@ -258,6 +264,7 @@ ClassDataProxy.loginName ="";
ClassDataProxy.password =""
ClassDataProxy.token ="";
ClassDataProxy.status = false;
ClassDataProxy.id = '';
ClassDataProxy.USER_TYPE_0 = 0;
ClassDataProxy.USER_TYPE_1 = 1;
... ...