董佳音

修改老师端显示问题,老师显示详情页

... ... @@ -946,9 +946,6 @@ body{
.scheduleWire2{
width: 335px;
}
.scheduleWire2{
width: 510px;
}
/*创建课堂第一步*/
.form_item{
margin-bottom: 10px;
... ... @@ -1103,7 +1100,6 @@ body{
}
.createClassLegendConfig{
padding-right: 530px;
background: transparent url(../images/icon-.png) right no-repeat;
color: #61719a;
}
.allowPublicDetail + label{
... ... @@ -1121,6 +1117,7 @@ body{
}
.classConfig_details{
padding-top:10px;
display: none;
}
/*底部*/
.footerBg{
... ... @@ -1388,6 +1385,7 @@ body{
width:200px;
height:270px;
background: #fff;
float: left;
}
.recordLi2{
width: 60%;
... ... @@ -1402,9 +1400,134 @@ body{
width:330px;
height:180px;
background: #fff;
float: left;
font-size: 14px;
color: #333333;
margin:0 15px;
}
.teacherMyCenter1{
padding:30px 0 15px 30px;
float: left;
}
.teacherMyCenterImg{
width:50px;
height:50px;
float: left;
}
.teacherMyCenterInfoBox{
float: left;
padding-left:30px;
}
.teacherMyCenterInfo{
float: left;
width: 100%;
}
.teacherMyCenter2{
float: left;
width: 100%;
padding-top:12px;
padding-left:30px;
}
.teacherMyCenterTitle{
float: left;
}
.teacherGradeImgBox{
}
.teacherGradeImg{
width:16px;
height:16px;
display: inline-block;
}
.myCenterTopRightBox{
width:640px;
height:180px;
width: 600px;
height: 140px;
background: #fff;
padding: 20px;
float: left;
}
.myCenterTopRightTit{
font-size: 16px;
color: #333333;
padding-bottom:20px;
}
.teacherTodayCourseList{
font-size: 12px;
color:#333333;
float: left;
width: 100%;
}
.teacherStartContent{
color:#d95136;
}
.courseDetailInfo{
float: left;
line-height: 28px;
padding:5px 0;
}
.courseDetailInfo1{
line-height: 28px;
padding:5px 0 5px 125px;
}
.teacherEnterClass{
height: 28px;
width: 70px;
border-radius: 3px;
background: #3498db;
font-size: 12px;
color:#fff;
display: inline-block;
border:none;
float: right;
}
.myCenterContentTitleBox{
width:985px;
height:44px;
line-height: 44px;
margin:15px 0 15px 15px;
background: #fff;
font-size: 12px;
color:#666666;
float: left;
}
.myCenterContentList{
width:985px;
float: left;
margin-left:15px;
}
.classifyListMyCenter{
width: 235px;
height: 232px;
float: left;
background: #fff;
margin-right: 25px;
cursor: pointer;
}
.classifyListMyCenter:hover{
box-shadow: 1px 5px 15px #adadad;
}
.myCenterContentListImg{
width: 235px;
height:138px;
}
.myCenterContentListTit{
font-size: 14px;
color: #333333;
padding:8px 5px 0 5px;
}
.myCenterContentListTit1{
padding:5px 5px 0 5px;
font-size: 12px;
color: #333333;
}
.myCenterContentMin{
color:#999999;
font-size: 12px;
padding:12px 5px 0 5px;
}
.myCenterContentTimer{
float: right;
color:#999999;
font-size: 12px;
padding-right: 5px;
}
\ No newline at end of file
... ...
... ... @@ -824,10 +824,11 @@
</div>
</div>
<div class="createClassMoreOptionBox">
<p class="createClassLegend">
<span class="createClassLegendConfig">更多参数</span>
<p class="createClassLegend" id="openParamBtn">
<span class="createClassLegendConfig" id="createClassLegendConfig">更多参数</span>
<img id="createClassLegendImg" src="images/icon-.png" alt="">
</p>
<div class="classConfig_details">
<div class="classConfig_details" id="classConfig_details">
<div style="width:100%;float:left;">
<div class="form_item form_item1">
<label class="step_page1Title step_page1Title2">
... ... @@ -968,17 +969,73 @@
</ul>
</div>
<div class="myCenterContentBox">
<div class="myCenterTopLeftBox"></div>
<div class="myCenterTopRightBox"></div>
<div class="myCenterContentTitle">
<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/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>
</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>
</div>
<div class="myCenterContent">
<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>
... ...
... ... @@ -12,7 +12,6 @@ MessageTypes.LOGIN_IN= "login_in"; //更新用户退出
//header按钮
MessageTypes.HOME_SKIP= "home_skip"; //首页跳转
MessageTypes.TEACHER_SKIP= "teacher_skip"; //老师跳转
... ...
... ... @@ -38,6 +38,8 @@ class CreateClassApe extends Ape {
$('#createClassUpTwo').on('click',this._createClassUpTwoHandler.bind(this));//创建课堂第二步
$('#createClassSubmit3').on('click',this._createClassSubmit3Handler.bind(this));//创建课堂第三步
$('#openParamBtn').on('click',this._openParamBtnHandler.bind(this));//打开更多参数
//日历插件
this._dateUI();
}
... ... @@ -163,6 +165,7 @@ class CreateClassApe extends Ape {
_createClassUpTwoHandler(){
$('#scheduleForm2').show();
$('#scheduleForm3').hide();
$('#classConfig_details').hide();
}
_createClassSubmit3Handler(){
let chatInterval = $('#chatInterval').val();
... ... @@ -189,6 +192,18 @@ class CreateClassApe extends Ape {
//清空创建信息界面
this._closeCreateClass();
}
//打开更多参数
_openParamBtnHandler(){
let classConfig_details = $('#classConfig_details');
let createClassLegendImg = $('#createClassLegendImg');
if(classConfig_details.is(':hidden')){
classConfig_details.show();
createClassLegendImg.attr('src','images/icon-t.png');
}else{
classConfig_details.hide();
createClassLegendImg.attr('src','images/icon-.png');
}
}
detailClass(){
let dateList = this.classDateList;
let _url = ClassDataProxy.locationProtocol + ClassDataProxy.locationProt + '/meeting/createMeeting';
... ...
... ... @@ -16,7 +16,14 @@ const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}">
</p>
</div>`;
const teacherList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}">
<img class="curriculumListImg" src="{_msgImg}" alt="">
<p class="curriculumListTit">{_classroomTitle}</p>
<p class="curriculumListInfo">
<span class="curriculumListTime">{_schoolTime}</span>
<span class="curriculumListNum">{_subscribeNum}</span>
</p>
</div>`;
let loger = Loger.getLoger('PC-HomeApe');
class HomeApe extends Ape {
constructor() {
... ... @@ -55,11 +62,7 @@ class HomeApe extends Ape {
_lanclassBtnHandler(evt){
loger.log('首页',ClassDataProxy.userType)
$(evt.target).addClass('header_listMsgCheck').siblings().removeClass('header_listMsgCheck');
if( ClassDataProxy.userType== ClassDataProxy.USER_TYPE_8 || ClassDataProxy.userType== ClassDataProxy.USER_TYPE_0){
this.studentClick();
}else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
this._emit(MessageTypes.HOME_SKIP,{userType:ClassDataProxy.userType});
}
}
detailPage(){
let that = this;
... ... @@ -139,10 +142,24 @@ class HomeApe extends Ape {
_msgImg :'../images/u373.png',
_classroomTitle : _dataList[i].meetingName,
_schoolTime : _getTime,
_subscribeNum : _dataList[i].reservationNumber+'人已预约'
_subscribeNum : '12人已预约'
})
liveList.append(_classifyList);
lanclassList.append(_classifyList);
}
}
for(let i = 0;i<_dataList.length;i++){
if(i<8){
let j = (i%4)==3;
let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime)
let _classifyList = this._format(teacherList,{
_classifyListR : j?'classifyListR':'',
_id : _dataList[i].id,
_msgImg :'../images/u373.png',
_classroomTitle : _dataList[i].meetingName,
_schoolTime : _getTime,
_subscribeNum : '34人已预约'
})
teacherIntro.append(_classifyList);
}
}
... ...
... ... @@ -12,6 +12,7 @@ class ListDetailsApe extends Ape {
constructor() {
super();
this.addEvent();
this.isDate = 0;
this.init();
}
... ... @@ -27,6 +28,8 @@ class ListDetailsApe extends Ape {
_curriculumListHandler(evt){
$('#slideshow').hide();
let _id = evt.currentTarget.id;
let isDate = $(evt.currentTarget).attr('data');
this.isDate = isDate;
this.detailPage(_id);
}
_collectYesHandler(){
... ... @@ -70,14 +73,10 @@ class ListDetailsApe extends Ape {
}
_classDateContent(_data){
let _dataList = _data.meetingInfo[0];
if(_dataList.meetingType == 1){
loger.log('互动课堂')
if(this.isDate){
this._lanclassRender(_dataList);
}else if(_dataList.meetingType == 2){
loger.log('直播课堂')
this._liveRender(_dataList);
}else{
this._lanclassRender(_dataList);
this._liveRender(_dataList);
}
$('#classifyListBox').hide();
}
... ...
... ... @@ -289,7 +289,7 @@ class LoginOrRegister extends Ape {
success:function(_data){
loger.log('登录返回数据',_data)
if(_data || _data.code == 200){
ClassDataProxy.userType = ClassDataProxy.USER_TYPE_2;
ClassDataProxy.userType = ClassDataProxy.USER_TYPE_1;
//ClassDataProxy.userType= _data.returnData.data.userType;
ClassDataProxy.loginName =_name.value;
ClassDataProxy.password = _passWord.value;
... ...
... ... @@ -11,7 +11,7 @@ import ClassDataProxy from "proxy/ClassDataProxy";
let loger = Loger.getLoger('PC-TeacherDetailApe');
const classifyList = `<div class="classifyList {_classifyListR}" id="{_id}">
const classifyList = `<div class="classifyList {_classifyListR}" data="1" id="{_id}">
<img class="curriculumListImg" src="{_msgImg}" alt="">
<p class="curriculumListTit">{_classroomTitle}</p>
<p class="curriculumListInfo">
... ... @@ -24,6 +24,7 @@ class TeacherDetailApe extends Ape {
constructor() {
super();
this.classDateList = {};//课堂的所有数据
this.isLocalStorage();
this.addEvent();
this.init();
}
... ... @@ -42,6 +43,11 @@ class TeacherDetailApe extends Ape {
addEvent() {
}
isLocalStorage(){
if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){
$('#myCenterBox').show();
}
}
_teacherBtnHandler(evt){
loger.log('老师',ClassDataProxy.userType)
this._clearListContent();
... ... @@ -159,7 +165,7 @@ class TeacherDetailApe extends Ape {
_msgImg :'../images/u373.png',
_classroomTitle : _dataList[i].meetingName,
_schoolTime : _getTime,
_subscribeNum : _dataList[i].reservationNumber+'人已预约'
_subscribeNum : '27人已预约'
})
classifyListContent.append(_classifyList);
}
... ...
... ... @@ -35,7 +35,7 @@ let _myCenterApe;
class Main {
constructor() {
this.clientVersion="v1.5.3.20170903";
this.clientVersion="v1.5.4.20170903";
loger.warn("clientVersion:"+this.clientVersion);
let locationProtocol= location.protocol;
... ... @@ -164,14 +164,13 @@ class Main {
}
}
}
homeSkip(_data){
if(_data && _data.userType){
if(_data.userType == ClassDataProxy.USER_TYPE_1){
homeSkip(_data) {
if (_data && _data.userType) {
if (_data.userType == ClassDataProxy.USER_TYPE_1) {
_teacherDetailApe.detailPage();
}
}
}
//判断登录用户的状态
_localStorageState(){
let userType = window.localStorage.getItem('userType')||0;
... ... @@ -213,11 +212,11 @@ class Main {
$('#slideshow').hide();
$('#defaultBox').hide();
$('.curriculumBox').hide();
$('#header_list').show();
$('#header_seek').show();
$('#androidDownload').show();
$('#header_list').hide();
$('#header_seek').hide();
$('#androidDownload').hide();
$('#classManagementBox').hide();
$('#classifyListBox').show();
$('#classifyListBox').hide();
}
_student(){
$('#slideshow').show();
... ...