正在显示
13 个修改的文件
包含
286 行增加
和
55 行删除
| @@ -871,11 +871,21 @@ body{ | @@ -871,11 +871,21 @@ body{ | ||
| 871 | } | 871 | } |
| 872 | .tr_mainRight{ | 872 | .tr_mainRight{ |
| 873 | border-right:1px solid #e6e6e6; | 873 | border-right:1px solid #e6e6e6; |
| 874 | + position: relative; | ||
| 874 | } | 875 | } |
| 875 | .classHandlePort{ | 876 | .classHandlePort{ |
| 876 | - margin: 0 3px; | 877 | + margin: 0 2px; |
| 877 | color:#3498db; | 878 | color:#3498db; |
| 878 | } | 879 | } |
| 880 | +.updatacoverFile{ | ||
| 881 | + width: 53px; | ||
| 882 | + height: 20px; | ||
| 883 | + position: absolute; | ||
| 884 | + right: 6px; | ||
| 885 | + top: 6px; | ||
| 886 | + opacity:0; | ||
| 887 | + cursor: pointer; | ||
| 888 | +} | ||
| 879 | .classHandlePortCheck{ | 889 | .classHandlePortCheck{ |
| 880 | color:#999999; | 890 | color:#999999; |
| 881 | } | 891 | } |
| @@ -1713,6 +1723,7 @@ body{ | @@ -1713,6 +1723,7 @@ body{ | ||
| 1713 | padding:30px 0 0 45px; | 1723 | padding:30px 0 0 45px; |
| 1714 | } | 1724 | } |
| 1715 | .oneselfInfoList1{ | 1725 | .oneselfInfoList1{ |
| 1726 | + position: relative; | ||
| 1716 | } | 1727 | } |
| 1717 | .oneselfInfoHeader{ | 1728 | .oneselfInfoHeader{ |
| 1718 | font-size: 14px; | 1729 | font-size: 14px; |
| @@ -2029,4 +2040,54 @@ body{ | @@ -2029,4 +2040,54 @@ body{ | ||
| 2029 | color: #999999; | 2040 | color: #999999; |
| 2030 | padding-left: 15px; | 2041 | padding-left: 15px; |
| 2031 | } | 2042 | } |
| 2032 | - | 2043 | +/*上传图片*/ |
| 2044 | +.updataPhoto{ | ||
| 2045 | + width:450px; | ||
| 2046 | + height:300px; | ||
| 2047 | +} | ||
| 2048 | +.updataPhotoContent{ | ||
| 2049 | + padding: 50px 0 0 80px; | ||
| 2050 | +} | ||
| 2051 | +.updataPhotoBtn{ | ||
| 2052 | + position: absolute; | ||
| 2053 | + left:50%; | ||
| 2054 | + bottom:30px; | ||
| 2055 | + margin-left:-50px; | ||
| 2056 | + border:none; | ||
| 2057 | +} | ||
| 2058 | +.updataPhotoInput{ | ||
| 2059 | + /* width: 100px; | ||
| 2060 | + height: 34px; | ||
| 2061 | + opacity:0; | ||
| 2062 | + position: absolute; | ||
| 2063 | + left:0; | ||
| 2064 | + top:0;*/ | ||
| 2065 | + float: left; | ||
| 2066 | + padding-left:50px; | ||
| 2067 | +} | ||
| 2068 | +.updataPhotoImg{ | ||
| 2069 | + width: 120px; | ||
| 2070 | + height: 100px; | ||
| 2071 | + border: 1px solid #999999; | ||
| 2072 | + margin: 20px 0 0 80px; | ||
| 2073 | + float: left; | ||
| 2074 | + background-size: 100% 100%; | ||
| 2075 | + background-repeat: no-repeat; | ||
| 2076 | + background-position: center center; | ||
| 2077 | +} | ||
| 2078 | +.personagePortraitImg{ | ||
| 2079 | + width:50px; | ||
| 2080 | + height:50px; | ||
| 2081 | + background-size: 100%; | ||
| 2082 | + border-radius: 50%; | ||
| 2083 | + border:1px solid #e8e4e4; | ||
| 2084 | +} | ||
| 2085 | +.personagePhoto{ | ||
| 2086 | + position: absolute; | ||
| 2087 | + left: 125px; | ||
| 2088 | + top: 30px; | ||
| 2089 | + opacity:0; | ||
| 2090 | + width:50px; | ||
| 2091 | + height: 50px; | ||
| 2092 | + border-radius: 50%; | ||
| 2093 | +} |
| @@ -1367,7 +1367,7 @@ | @@ -1367,7 +1367,7 @@ | ||
| 1367 | <div class="myCenterContentBox"> | 1367 | <div class="myCenterContentBox"> |
| 1368 | <div class="myCenterTopLeftBox"> | 1368 | <div class="myCenterTopLeftBox"> |
| 1369 | <div class="teacherMyCenter1"> | 1369 | <div class="teacherMyCenter1"> |
| 1370 | - <img class="teacherMyCenterImg" src="images/u373.png" alt=""> | 1370 | + <img class="teacherMyCenterImg" id="myCenterImg" src="images/u373.png" alt=""> |
| 1371 | <p class="teacherMyCenterInfoBox"> | 1371 | <p class="teacherMyCenterInfoBox"> |
| 1372 | <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span> | 1372 | <span class="teacherMyCenterInfo" id="teacherMyCenterTime">上午好,</span> |
| 1373 | <span id="teacherMyCenterName"></span> | 1373 | <span id="teacherMyCenterName"></span> |
| @@ -1565,7 +1565,10 @@ | @@ -1565,7 +1565,10 @@ | ||
| 1565 | <ul class="oneselfInfoUI"> | 1565 | <ul class="oneselfInfoUI"> |
| 1566 | <li class="oneselfInfoList oneselfInfoList1"> | 1566 | <li class="oneselfInfoList oneselfInfoList1"> |
| 1567 | <label class="oneselfInfoHeader">头像</label> | 1567 | <label class="oneselfInfoHeader">头像</label> |
| 1568 | - <img src="images/u293.png" alt=""> | 1568 | + <img src="images/u293.png" alt="" class="personagePortraitImg" id="personagePortrait"> |
| 1569 | + <form id="personagePhotoForm"> | ||
| 1570 | + <input class="personagePhoto" id="personagePortraitBtn" type="file" name="file"/> | ||
| 1571 | + </form> | ||
| 1569 | </li> | 1572 | </li> |
| 1570 | <li class="oneselfInfoList"> | 1573 | <li class="oneselfInfoList"> |
| 1571 | <label class="oneselfInfoHeader">登录名</label> | 1574 | <label class="oneselfInfoHeader">登录名</label> |
| @@ -2511,6 +2514,21 @@ | @@ -2511,6 +2514,21 @@ | ||
| 2511 | </table> | 2514 | </table> |
| 2512 | </div> | 2515 | </div> |
| 2513 | </div> | 2516 | </div> |
| 2517 | + <!--上传图片--> | ||
| 2518 | + <div class="userSignBox" id="updataPhotoBox"> | ||
| 2519 | + <div class="usersign updataPhoto" id="updataPhoto"> | ||
| 2520 | + <a href="javascript: void(0)" id="updataPhotoA" class="usersignA iconfont"></a> | ||
| 2521 | + <div class="updataPhotoContent" id="updataPhotoContent"> | ||
| 2522 | + <form id="updataPhotoForm" > | ||
| 2523 | + <!-- <span class="addUserBtn updataPhotoBtn">上传封面--> | ||
| 2524 | + <input class="updataPhotoInput" id="updataPhotoInput" type="file" name="file"/> | ||
| 2525 | + <!--</span>--> | ||
| 2526 | + <div class="updataPhotoImg" id="updataPhotoImg"></div> | ||
| 2527 | + <span class="addUserBtn updataPhotoBtn" id="updataPhotoBtn">上传</span> | ||
| 2528 | + </form> | ||
| 2529 | + </div> | ||
| 2530 | + </div> | ||
| 2531 | + </div> | ||
| 2514 | </div> | 2532 | </div> |
| 2515 | <div class="footerBg"> | 2533 | <div class="footerBg"> |
| 2516 | <div class="footer"> | 2534 | <div class="footer"> |
| @@ -32,8 +32,6 @@ class AdministratorApe extends Ape { | @@ -32,8 +32,6 @@ class AdministratorApe extends Ape { | ||
| 32 | isLocalStorage(){ | 32 | isLocalStorage(){ |
| 33 | //设置当前时间 给输入框默认值 | 33 | //设置当前时间 给输入框默认值 |
| 34 | this._setNewTime(); | 34 | this._setNewTime(); |
| 35 | - //设置弹框位置 | ||
| 36 | - // this._setMarginTop(); | ||
| 37 | } | 35 | } |
| 38 | _switchover(evt){ | 36 | _switchover(evt){ |
| 39 | $(evt.currentTarget).addClass('recordLiCheck').siblings().removeClass('recordLiCheck'); | 37 | $(evt.currentTarget).addClass('recordLiCheck').siblings().removeClass('recordLiCheck'); |
| @@ -81,25 +79,5 @@ class AdministratorApe extends Ape { | @@ -81,25 +79,5 @@ class AdministratorApe extends Ape { | ||
| 81 | $('.liveInfoCenterLiveEnd').html(time); | 79 | $('.liveInfoCenterLiveEnd').html(time); |
| 82 | $('#createUserAbortTime').html(time); | 80 | $('#createUserAbortTime').html(time); |
| 83 | } | 81 | } |
| 84 | - //设置弹框位置 | ||
| 85 | - _setMarginTop(){ | ||
| 86 | - this._setMarginTopHandler($('#createUserAccount'));//创建用户选择身份 | ||
| 87 | - this._setMarginTopHandler($('#userLogin'));//登录 | ||
| 88 | - this._setMarginTopHandler($('#usersign'));//注册 | ||
| 89 | - this._setMarginTopHandler($('#warnHintBox'));//错误提示 | ||
| 90 | - this._setMarginTopHandler($('#removeHandler'));//删除 | ||
| 91 | - this._setMarginTopHandler($('.updateInputBox'));//修改信息输入框 | ||
| 92 | - this._setMarginTopHandler($('#teacherDetailReminders'));//预约成功弹框 | ||
| 93 | - this._setMarginTopHandler($('#createUser'));//注册老师账号 | ||
| 94 | - this._setMarginTopHandler($('#createClass'));//创建课堂 | ||
| 95 | - } | ||
| 96 | - //设置弹框位置 方法 | ||
| 97 | - _setMarginTopHandler(_data){ | ||
| 98 | - let top = ($(window).height() - _data.height())/2; | ||
| 99 | - let left = ($(window).width() - _data.width())/2; | ||
| 100 | - let scrollTop = $(document).scrollTop(); | ||
| 101 | - let scrollLeft = $(document).scrollLeft(); | ||
| 102 | - _data.css( { position : 'absolute', 'top' : top + scrollTop, left : left + scrollLeft } ); | ||
| 103 | - } | ||
| 104 | } | 82 | } |
| 105 | export default AdministratorApe; | 83 | export default AdministratorApe; |
| @@ -165,10 +165,12 @@ class HomeApe extends Ape { | @@ -165,10 +165,12 @@ class HomeApe extends Ape { | ||
| 165 | if(i<8){ | 165 | if(i<8){ |
| 166 | let j = (i%4)==3; | 166 | let j = (i%4)==3; |
| 167 | let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime) | 167 | let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime) |
| 168 | + let _img = '../images/u373.png'; | ||
| 169 | + let _classImg = _data[i].meetingPhoto | ||
| 168 | let _classifyList = this._format(classifyList,{ | 170 | let _classifyList = this._format(classifyList,{ |
| 169 | _classifyListR : j?'classifyListR':'', | 171 | _classifyListR : j?'classifyListR':'', |
| 170 | _id : _data[i].id, | 172 | _id : _data[i].id, |
| 171 | - _msgImg :'../images/u373.png', | 173 | + _msgImg :_classImg?_classImg:_img, |
| 172 | _classroomTitle : _data[i].meetingName, | 174 | _classroomTitle : _data[i].meetingName, |
| 173 | _schoolTime : _getTime, | 175 | _schoolTime : _getTime, |
| 174 | _subscribeNum : _data[i].reservationNumber+'人预约' | 176 | _subscribeNum : _data[i].reservationNumber+'人预约' |
| @@ -186,10 +188,12 @@ class HomeApe extends Ape { | @@ -186,10 +188,12 @@ class HomeApe extends Ape { | ||
| 186 | if(i<8){ | 188 | if(i<8){ |
| 187 | let j = (i%4)==3; | 189 | let j = (i%4)==3; |
| 188 | let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime) | 190 | let _getTime = ClassDataProxy.getTimeDifference(_data[i].beginTime,_data[i].endTime) |
| 191 | + let _img = '../images/u373.png'; | ||
| 192 | + let _classImg = _data[i].meetingPhoto; | ||
| 189 | let _classifyList = this._format(classifyList,{ | 193 | let _classifyList = this._format(classifyList,{ |
| 190 | _classifyListR : j?'classifyListR':'', | 194 | _classifyListR : j?'classifyListR':'', |
| 191 | _id : _data[i].id, | 195 | _id : _data[i].id, |
| 192 | - _msgImg :'../images/u373.png', | 196 | + _msgImg :_classImg?_classImg:_img, |
| 193 | _classroomTitle : _data[i].meetingName, | 197 | _classroomTitle : _data[i].meetingName, |
| 194 | _schoolTime : _getTime, | 198 | _schoolTime : _getTime, |
| 195 | _subscribeNum : _data[i].reservationNumber+'人预约' | 199 | _subscribeNum : _data[i].reservationNumber+'人预约' |
| @@ -206,11 +210,13 @@ class HomeApe extends Ape { | @@ -206,11 +210,13 @@ class HomeApe extends Ape { | ||
| 206 | if(_data){ | 210 | if(_data){ |
| 207 | for(let i = 0;i<_data.length;i++){ | 211 | for(let i = 0;i<_data.length;i++){ |
| 208 | let j = (i%4)==3; | 212 | let j = (i%4)==3; |
| 209 | - let _getTime = ClassDataProxy.getTimeDifference(_data[i].create_time,_data[i].end_time) | 213 | + let _getTime = ClassDataProxy.getTimeDifference(_data[i].create_time,_data[i].end_time); |
| 214 | + let _img = '../images/u373.png'; | ||
| 215 | + let _classImg = _data[i].meetingPhoto; | ||
| 210 | let _classifyList = this._format(teacherList,{ | 216 | let _classifyList = this._format(teacherList,{ |
| 211 | _classifyListR : j?'classifyListR':'', | 217 | _classifyListR : j?'classifyListR':'', |
| 212 | _id : _data[i].id, | 218 | _id : _data[i].id, |
| 213 | - _msgImg :'../images/u373.png', | 219 | + _msgImg :_classImg?_classImg:_img, |
| 214 | _classroomTitle : _data[i].user_name, | 220 | _classroomTitle : _data[i].user_name, |
| 215 | _schoolTime : _getTime.split('-')[0], | 221 | _schoolTime : _getTime.split('-')[0], |
| 216 | _subscribeNum : _data[i].reservationNumber+'人预约' | 222 | _subscribeNum : _data[i].reservationNumber+'人预约' |
| @@ -235,9 +241,10 @@ class HomeApe extends Ape { | @@ -235,9 +241,10 @@ class HomeApe extends Ape { | ||
| 235 | 241 | ||
| 236 | //首页点击 进入个人中心 | 242 | //首页点击 进入个人中心 |
| 237 | _homeCenterBtnHandler(){ | 243 | _homeCenterBtnHandler(){ |
| 238 | - if(ClassDataProxy.userType == 0){ | 244 | + $('#homeUserLoginBtn').attr('data',''); |
| 245 | + if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_0){ | ||
| 239 | this.toLogin(); | 246 | this.toLogin(); |
| 240 | - }else{ | 247 | + }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ |
| 241 | $('#slideshow').hide(); | 248 | $('#slideshow').hide(); |
| 242 | $('#defaultBox').hide(); | 249 | $('#defaultBox').hide(); |
| 243 | $('#classifyListBox').hide(); | 250 | $('#classifyListBox').hide(); |
| @@ -249,6 +256,16 @@ class HomeApe extends Ape { | @@ -249,6 +256,16 @@ class HomeApe extends Ape { | ||
| 249 | $('#myCenterBox').show(); | 256 | $('#myCenterBox').show(); |
| 250 | } | 257 | } |
| 251 | } | 258 | } |
| 259 | + studentClick(){ | ||
| 260 | + $('#slideshow').show(); | ||
| 261 | + $('#defaultBox').show(); | ||
| 262 | + $('.curriculumBox').show(); | ||
| 263 | + $('#classifyListBox').hide(); | ||
| 264 | + $('#teacherDetailBox').hide(); | ||
| 265 | + $('#lanclassBox').hide(); | ||
| 266 | + $('#myCenterBox').hide(); | ||
| 267 | + $('#lanclassAllBox').hide(); | ||
| 268 | + } | ||
| 252 | toLogin(){ | 269 | toLogin(){ |
| 253 | ClassDataProxy.getMarginTopHandler($('#userLogin')); | 270 | ClassDataProxy.getMarginTopHandler($('#userLogin')); |
| 254 | $('#userLoginBox').show(); | 271 | $('#userLoginBox').show(); |
| @@ -135,10 +135,12 @@ class LanclassApe extends Ape { | @@ -135,10 +135,12 @@ class LanclassApe extends Ape { | ||
| 135 | for(let i = 0;i<_dataList.length;i++){ | 135 | for(let i = 0;i<_dataList.length;i++){ |
| 136 | let j = (i%4)==3; | 136 | let j = (i%4)==3; |
| 137 | let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) | 137 | let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) |
| 138 | + let _img = '../images/u373.png'; | ||
| 139 | + let _classImg = _dataList[i].meetingPhoto; | ||
| 138 | let _classifyList = this._format(classifyList,{ | 140 | let _classifyList = this._format(classifyList,{ |
| 139 | _classifyListR : j?'classifyListR':'', | 141 | _classifyListR : j?'classifyListR':'', |
| 140 | _id : _dataList[i].id, | 142 | _id : _dataList[i].id, |
| 141 | - _msgImg :'../images/u373.png', | 143 | + _msgImg :_classImg?_classImg:_img, |
| 142 | _classroomTitle : _dataList[i].meetingName, | 144 | _classroomTitle : _dataList[i].meetingName, |
| 143 | _schoolTime : _getTime, | 145 | _schoolTime : _getTime, |
| 144 | _subscribeNum : _dataList[i].reservationNumber+'人预约' | 146 | _subscribeNum : _dataList[i].reservationNumber+'人预约' |
| @@ -143,11 +143,13 @@ class LiveClassApe extends Ape { | @@ -143,11 +143,13 @@ class LiveClassApe extends Ape { | ||
| 143 | if(_dataList){ | 143 | if(_dataList){ |
| 144 | for(let i = 0;i<_dataList.length;i++){ | 144 | for(let i = 0;i<_dataList.length;i++){ |
| 145 | let j = (i%4)==3; | 145 | let j = (i%4)==3; |
| 146 | - let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime) | 146 | + let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].beginTime,_dataList[i].endTime); |
| 147 | + let _img = '../images/u373.png'; | ||
| 148 | + let _classImg = _dataList[i].meetingPhoto; | ||
| 147 | let _classifyList = this._format(classifyList,{ | 149 | let _classifyList = this._format(classifyList,{ |
| 148 | _classifyListR : j?'classifyListR':'', | 150 | _classifyListR : j?'classifyListR':'', |
| 149 | _id : _dataList[i].id, | 151 | _id : _dataList[i].id, |
| 150 | - _msgImg :'../images/u373.png', | 152 | + _msgImg :_classImg?_classImg:_img, |
| 151 | _classroomTitle : _dataList[i].meetingName, | 153 | _classroomTitle : _dataList[i].meetingName, |
| 152 | _schoolTime : _getTime, | 154 | _schoolTime : _getTime, |
| 153 | _subscribeNum : _dataList[i].reservationNumber+'人预约' | 155 | _subscribeNum : _dataList[i].reservationNumber+'人预约' |
| @@ -113,6 +113,7 @@ class LoginOrRegister extends Ape { | @@ -113,6 +113,7 @@ class LoginOrRegister extends Ape { | ||
| 113 | ClassDataProxy.loginName =""; | 113 | ClassDataProxy.loginName =""; |
| 114 | ClassDataProxy.password ="" | 114 | ClassDataProxy.password ="" |
| 115 | ClassDataProxy.token =""; | 115 | ClassDataProxy.token =""; |
| 116 | + ClassDataProxy.userPhoto =""; | ||
| 116 | ClassDataProxy.status = false; | 117 | ClassDataProxy.status = false; |
| 117 | 118 | ||
| 118 | } | 119 | } |
| @@ -322,6 +323,7 @@ class LoginOrRegister extends Ape { | @@ -322,6 +323,7 @@ class LoginOrRegister extends Ape { | ||
| 322 | ClassDataProxy.loginName =_name.value; | 323 | ClassDataProxy.loginName =_name.value; |
| 323 | ClassDataProxy.password = _passWord.value; | 324 | ClassDataProxy.password = _passWord.value; |
| 324 | ClassDataProxy.token =_data.returnData.data.token | 325 | ClassDataProxy.token =_data.returnData.data.token |
| 326 | + ClassDataProxy.userPhoto = _data.returnData.data.userPhoto; | ||
| 325 | ClassDataProxy.status = true; | 327 | ClassDataProxy.status = true; |
| 326 | ClassDataProxy.id = _data.returnData.data.id; | 328 | ClassDataProxy.id = _data.returnData.data.id; |
| 327 | // ClassDataProxy.siteId = _data.returnData.data.siteId; | 329 | // ClassDataProxy.siteId = _data.returnData.data.siteId; |
| @@ -334,6 +336,7 @@ class LoginOrRegister extends Ape { | @@ -334,6 +336,7 @@ class LoginOrRegister extends Ape { | ||
| 334 | window.localStorage.setItem("password", ClassDataProxy.password );//密码 | 336 | window.localStorage.setItem("password", ClassDataProxy.password );//密码 |
| 335 | window.localStorage.setItem("userType", ClassDataProxy.userType); | 337 | window.localStorage.setItem("userType", ClassDataProxy.userType); |
| 336 | window.localStorage.setItem("token", ClassDataProxy.token ); | 338 | window.localStorage.setItem("token", ClassDataProxy.token ); |
| 339 | + window.localStorage.setItem("userPhoto", ClassDataProxy.userPhoto );//个人图片 | ||
| 337 | window.localStorage.setItem('status', ClassDataProxy.status); | 340 | window.localStorage.setItem('status', ClassDataProxy.status); |
| 338 | window.localStorage.setItem('id', ClassDataProxy.id); | 341 | window.localStorage.setItem('id', ClassDataProxy.id); |
| 339 | window.localStorage.setItem('siteId', ClassDataProxy.siteId); | 342 | window.localStorage.setItem('siteId', ClassDataProxy.siteId); |
| @@ -373,7 +376,7 @@ class LoginOrRegister extends Ape { | @@ -373,7 +376,7 @@ class LoginOrRegister extends Ape { | ||
| 373 | updateChangeUser(_data){ | 376 | updateChangeUser(_data){ |
| 374 | let _isMyCenter = $('#homeUserLoginBtn').attr('data'); | 377 | let _isMyCenter = $('#homeUserLoginBtn').attr('data'); |
| 375 | 378 | ||
| 376 | - if(parseInt(_isMyCenter) == 1){ | 379 | + if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8 && parseInt(_isMyCenter) == 1){ |
| 377 | $('#slideshow').hide(); | 380 | $('#slideshow').hide(); |
| 378 | $('#defaultBox').hide(); | 381 | $('#defaultBox').hide(); |
| 379 | $('#classifyListBox').hide(); | 382 | $('#classifyListBox').hide(); |
| @@ -382,16 +385,26 @@ class LoginOrRegister extends Ape { | @@ -382,16 +385,26 @@ class LoginOrRegister extends Ape { | ||
| 382 | $('#lanclassAllBox').hide(); | 385 | $('#lanclassAllBox').hide(); |
| 383 | $('#teacherIntroAllBox').hide(); | 386 | $('#teacherIntroAllBox').hide(); |
| 384 | $('#teacherDetailBox').hide(); | 387 | $('#teacherDetailBox').hide(); |
| 388 | + $('#myCenterBox').show(); | ||
| 389 | + }else{ | ||
| 390 | + $('#myCenterBox').hide(); | ||
| 385 | } | 391 | } |
| 392 | + if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | ||
| 386 | $('#myCenterBox').show(); | 393 | $('#myCenterBox').show(); |
| 394 | + } | ||
| 395 | + | ||
| 387 | // loger.log('登录成功后更改用户名',_data) | 396 | // loger.log('登录成功后更改用户名',_data) |
| 388 | let _dataList = _data.returnData.data; | 397 | let _dataList = _data.returnData.data; |
| 398 | + let myCenterImg = $('#myCenterImg');//个人信息首页 | ||
| 399 | + let personagePortrait = $('#personagePortrait');//个人信息 | ||
| 389 | let oneselfInfoLoginName = $('#oneselfInfoLoginName');//登录名 | 400 | let oneselfInfoLoginName = $('#oneselfInfoLoginName');//登录名 |
| 390 | let oneselfInfoUserName = $('#oneselfInfoUserName');//用户名 | 401 | let oneselfInfoUserName = $('#oneselfInfoUserName');//用户名 |
| 391 | let setPassWord = $('#setPassWord');//密码 | 402 | let setPassWord = $('#setPassWord');//密码 |
| 392 | let setMail = $('#setMail');//邮箱 | 403 | let setMail = $('#setMail');//邮箱 |
| 393 | let setPhone = $('#setPhone');//手机号 | 404 | let setPhone = $('#setPhone');//手机号 |
| 394 | 405 | ||
| 406 | + myCenterImg.attr('src',_dataList.userPhoto) | ||
| 407 | + personagePortrait.attr('src',_dataList.userPhoto) | ||
| 395 | oneselfInfoLoginName.val(_dataList.loginName); | 408 | oneselfInfoLoginName.val(_dataList.loginName); |
| 396 | oneselfInfoUserName.val(_dataList.userName); | 409 | oneselfInfoUserName.val(_dataList.userName); |
| 397 | 410 |
| @@ -7,6 +7,7 @@ import Ape from "./Ape"; | @@ -7,6 +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 | +import ErrorApe from "./ErrorApe"; | ||
| 10 | let loger = Loger.getLoger('PC-ManagementHomePageApe'); | 11 | let loger = Loger.getLoger('PC-ManagementHomePageApe'); |
| 11 | 12 | ||
| 12 | const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" class="t_box"> | 13 | const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspacing="0" border="0" class="t_box"> |
| @@ -30,7 +31,7 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | @@ -30,7 +31,7 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | ||
| 30 | <th width="6%" class="tr_center"> | 31 | <th width="6%" class="tr_center"> |
| 31 | 在线人数 | 32 | 在线人数 |
| 32 | </th> | 33 | </th> |
| 33 | - <th width="20%" class="tr_center"> | 34 | + <th width="23%" class="tr_center"> |
| 34 | 操作 | 35 | 操作 |
| 35 | </th> | 36 | </th> |
| 36 | </tr> | 37 | </tr> |
| @@ -43,22 +44,38 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | @@ -43,22 +44,38 @@ const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor= | ||
| 43 | <td width="6%" class="tr_main">{_stateInfo}</td> | 44 | <td width="6%" class="tr_main">{_stateInfo}</td> |
| 44 | <td width="18%" class="tr_main">{_time}</td> | 45 | <td width="18%" class="tr_main">{_time}</td> |
| 45 | <td width="6%" class="tr_main">{_onlineLen}</td> | 46 | <td width="6%" class="tr_main">{_onlineLen}</td> |
| 46 | - <td width="18%" class="tr_main tr_mainRight" align="center" data="{_esenglish}"> | 47 | + <td width="21%" class="tr_main tr_mainRight" align="center" data="{_esenglish}"> |
| 47 | <a id="{_DocInd}" class="classHandlePort" href="###">文档</a> | 48 | <a id="{_DocInd}" class="classHandlePort" href="###">文档</a> |
| 48 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> | 49 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> |
| 49 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> | 50 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> |
| 50 | <a id="{_updateInd}" class="classHandlePort" href="###">修改</a> | 51 | <a id="{_updateInd}" class="classHandlePort" href="###">修改</a> |
| 51 | <a data="{_removeInd}" class="classHandlePort deleteClass" href="#">删除</a> | 52 | <a data="{_removeInd}" class="classHandlePort deleteClass" href="#">删除</a> |
| 52 | <a data="{_joinInd}" class="classHandlePort joinClass" href="#">加入课堂</a> | 53 | <a data="{_joinInd}" class="classHandlePort joinClass" href="#">加入课堂</a> |
| 54 | + <a data="{_removeInd}" class="classHandlePort updatacover" href="###">上传封面 | ||
| 55 | + <!--<input type="file" id="{_updatacover}" class="updatacoverFile"/>--> | ||
| 56 | + </a> | ||
| 53 | </td> | 57 | </td> |
| 54 | </tr> | 58 | </tr> |
| 55 | `; | 59 | `; |
| 56 | const adminListEnd = `</tbody></table>`; | 60 | const adminListEnd = `</tbody></table>`; |
| 61 | + | ||
| 62 | +const form = ` | ||
| 63 | + <form action="{_action}" method="post" enctype="multipart/form-data"> | ||
| 64 | + <input class="updataPhotoInput" id="updataPhotoInput" type="file" name="file"/> | ||
| 65 | + <div class="updataPhotoImg" id="updataPhotoImg"> | ||
| 66 | + | ||
| 67 | + </div> | ||
| 68 | + <div class="updataPhotoInfo" id="updataPhotoInfo"></div> | ||
| 69 | + <input class="addUserBtn updataPhotoBtn" id="updataPhotoBtn" type="submit" value="上传"/> | ||
| 70 | + </form> | ||
| 71 | +` | ||
| 57 | class ManagementHomePageApe extends Ape { | 72 | class ManagementHomePageApe extends Ape { |
| 58 | constructor() { | 73 | constructor() { |
| 59 | super(); | 74 | super(); |
| 60 | this.pageNo = 0; | 75 | this.pageNo = 0; |
| 61 | this.presentInd = 1; | 76 | this.presentInd = 1; |
| 77 | + this.files = {}; | ||
| 78 | + this.dataId = 0; | ||
| 62 | this.addEvent(); | 79 | this.addEvent(); |
| 63 | this.init(); | 80 | this.init(); |
| 64 | } | 81 | } |
| @@ -74,6 +91,14 @@ class ManagementHomePageApe extends Ape { | @@ -74,6 +91,14 @@ class ManagementHomePageApe extends Ape { | ||
| 74 | 91 | ||
| 75 | // $('#courseContent0').on('click','.deleteClass',this._deleteClass.bind(this));//删除课堂 | 92 | // $('#courseContent0').on('click','.deleteClass',this._deleteClass.bind(this));//删除课堂 |
| 76 | $('#courseContent0').on('click','.joinClass',this._joinClass.bind(this));//加入课堂 | 93 | $('#courseContent0').on('click','.joinClass',this._joinClass.bind(this));//加入课堂 |
| 94 | + | ||
| 95 | + $('#courseContent0').on('click','.updatacover',this._updatacover.bind(this));//上传课堂封面 | ||
| 96 | + $('#updataPhotoA').on('click',this._closeUpdatacover.bind(this));//上传课堂封面 取消 | ||
| 97 | + | ||
| 98 | + $('#updataPhotoInput').on('change',this._updataPhotoBtnHandler.bind(this));//上传课堂封面 取消 | ||
| 99 | + | ||
| 100 | + $('#updataPhotoBtn').on('click',this._submitBtnHandler.bind(this));//上传课堂封面 | ||
| 101 | + | ||
| 77 | } | 102 | } |
| 78 | 103 | ||
| 79 | addEvent() { | 104 | addEvent() { |
| @@ -124,6 +149,7 @@ class ManagementHomePageApe extends Ape { | @@ -124,6 +149,7 @@ class ManagementHomePageApe extends Ape { | ||
| 124 | url: _url, | 149 | url: _url, |
| 125 | data:{siteId:ClassDataProxy.siteId,meetingStatus:status}, | 150 | data:{siteId:ClassDataProxy.siteId,meetingStatus:status}, |
| 126 | headers: { | 151 | headers: { |
| 152 | + siteId:ClassDataProxy.siteId, | ||
| 127 | page:ind, | 153 | page:ind, |
| 128 | pageno:8, | 154 | pageno:8, |
| 129 | 'token':ClassDataProxy.token | 155 | 'token':ClassDataProxy.token |
| @@ -168,6 +194,7 @@ class ManagementHomePageApe extends Ape { | @@ -168,6 +194,7 @@ class ManagementHomePageApe extends Ape { | ||
| 168 | _mediaInd : 'classMedia'+i, | 194 | _mediaInd : 'classMedia'+i, |
| 169 | _musicInd : 'classMusic'+i, | 195 | _musicInd : 'classMusic'+i, |
| 170 | _updateInd : 'classUpdate'+i, | 196 | _updateInd : 'classUpdate'+i, |
| 197 | + _updatacover : 'updatacover'+i, | ||
| 171 | _removeInd : _dataList[i].id, | 198 | _removeInd : _dataList[i].id, |
| 172 | _joinInd : _dataList[i].meetingNumber | 199 | _joinInd : _dataList[i].meetingNumber |
| 173 | }) | 200 | }) |
| @@ -211,6 +238,76 @@ class ManagementHomePageApe extends Ape { | @@ -211,6 +238,76 @@ class ManagementHomePageApe extends Ape { | ||
| 211 | let _data = $(evt.target).attr('data'); | 238 | let _data = $(evt.target).attr('data'); |
| 212 | window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + _data); | 239 | window.open('http://networkshool.xuedianyun.com/3m/attend.do?meetingNumber=' + _data); |
| 213 | } | 240 | } |
| 241 | + _updatacover(evt){ | ||
| 242 | + ClassDataProxy.getMarginTopHandler($('#updataPhoto')); | ||
| 243 | + $('#updataPhotoBox').show(); | ||
| 244 | + let _data = $(evt.target).attr('data'); | ||
| 245 | + this.dataId = _data; | ||
| 246 | + } | ||
| 247 | + _closeUpdatacover(){ | ||
| 248 | + $('#updataPhotoBox').hide(); | ||
| 249 | + $("#updataPhotoInput").val(''); | ||
| 250 | + $("#updataPhotoImg")[0].style.backgroundImage = ''; | ||
| 251 | + } | ||
| 252 | + _updataPhotoBtnHandler() { | ||
| 253 | + let fileInput = document.getElementById('updataPhotoInput'); | ||
| 254 | + let preview = document.getElementById('updataPhotoImg'); | ||
| 255 | + let file = fileInput.files[0]; | ||
| 256 | + | ||
| 257 | + if (!file) { | ||
| 258 | + loger.log("没有选择文件"); | ||
| 259 | + return; | ||
| 260 | + } | ||
| 261 | + | ||
| 262 | + let fileStr = file.name; | ||
| 263 | + if(fileStr){ | ||
| 264 | + fileStr=fileStr.toLowerCase(); | ||
| 265 | + } | ||
| 266 | + | ||
| 267 | + if (fileStr.lastIndexOf('.jpg') < 0 && | ||
| 268 | + fileStr.lastIndexOf('.png') < 0) { | ||
| 269 | + alert('不是有效的图片文件!'); | ||
| 270 | + return; | ||
| 271 | + } | ||
| 272 | + | ||
| 273 | + let reader = new FileReader(); | ||
| 274 | + reader.onload = function(e){ | ||
| 275 | + let data = e.target.result; | ||
| 276 | + preview.style.backgroundImage = 'url(' + data + ')'; | ||
| 277 | + } | ||
| 278 | + reader.readAsDataURL(file); | ||
| 279 | + | ||
| 280 | + let data = new FormData($('#updataPhotoForm')[0]); | ||
| 281 | + this.files = data; | ||
| 282 | + } | ||
| 283 | + _submitBtnHandler(){ | ||
| 284 | + let _dataId = this.dataId; | ||
| 285 | + let _url = 'http://networkschool.xuedianyun.com:3001/upload/upLoadDoc?businessId='+_dataId+'&category=1' | ||
| 286 | + let files = this.files; | ||
| 287 | + let that = this; | ||
| 288 | + | ||
| 289 | + $.ajax({ | ||
| 290 | + type: "POST", | ||
| 291 | + url: _url, | ||
| 292 | + data: files, | ||
| 293 | + dataType: 'JSON', | ||
| 294 | + cache: false, | ||
| 295 | + processData: false, | ||
| 296 | + contentType: false, | ||
| 297 | + success:function(_data){ | ||
| 298 | + loger.log(_data,'成功1111') | ||
| 299 | + ClassDataProxy.getMarginTopHandler($('#warnHintBox')); | ||
| 300 | + ErrorApe.showWarnError('上传成功'); | ||
| 301 | + | ||
| 302 | + that._closeUpdatacover(); | ||
| 303 | + }.bind(this), | ||
| 304 | + error: function (_data) { | ||
| 305 | + ClassDataProxy.getMarginTopHandler($('#warnHintBox')); | ||
| 306 | + ErrorApe.showWarnError('上传失败'); | ||
| 307 | + loger.log(_data,'error') | ||
| 308 | + } | ||
| 309 | + }) | ||
| 310 | + } | ||
| 214 | _switchover(evt){ | 311 | _switchover(evt){ |
| 215 | $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); | 312 | $(evt.currentTarget).addClass('liveInfoLeftLiCheck').siblings().removeClass('liveInfoLeftLiCheck'); |
| 216 | } | 313 | } |
| @@ -424,7 +424,6 @@ class MyCenterApe extends Ape { | @@ -424,7 +424,6 @@ class MyCenterApe extends Ape { | ||
| 424 | let text = newHours>12?'下午好,':'上午好,' | 424 | let text = newHours>12?'下午好,':'上午好,' |
| 425 | $('#teacherMyCenterTime').text(text); | 425 | $('#teacherMyCenterTime').text(text); |
| 426 | 426 | ||
| 427 | - $('#myCenterBox').show(); | ||
| 428 | $('#teacherMyCenterName').text(ClassDataProxy.loginName); | 427 | $('#teacherMyCenterName').text(ClassDataProxy.loginName); |
| 429 | if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | 428 | if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ |
| 430 | $('#teacherMyCenterStatus').text('老师'); | 429 | $('#teacherMyCenterStatus').text('老师'); |
| @@ -432,25 +431,24 @@ class MyCenterApe extends Ape { | @@ -432,25 +431,24 @@ class MyCenterApe extends Ape { | ||
| 432 | $('#studentMyCerter').hide(); | 431 | $('#studentMyCerter').hide(); |
| 433 | $('#teacherUI .recordLi').eq(2).hide(); | 432 | $('#teacherUI .recordLi').eq(2).hide(); |
| 434 | this.detailPageTeacher(); | 433 | this.detailPageTeacher(); |
| 435 | - | 434 | + $('#myCenterBox').show(); |
| 436 | }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ | 435 | }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_8){ |
| 437 | $('#teacherMyCenterStatus').text('同学'); | 436 | $('#teacherMyCenterStatus').text('同学'); |
| 438 | $('#teacherMyCerter').hide(); | 437 | $('#teacherMyCerter').hide(); |
| 439 | $('#studentMyCerter').show(); | 438 | $('#studentMyCerter').show(); |
| 440 | $('#teacherUI .recordLi').eq(2).show(); | 439 | $('#teacherUI .recordLi').eq(2).show(); |
| 441 | this.detailPageStudent(); | 440 | this.detailPageStudent(); |
| 442 | - | ||
| 443 | } | 441 | } |
| 444 | } | 442 | } |
| 445 | isLocalStorage(){ | 443 | isLocalStorage(){ |
| 446 | this.detailpage(); | 444 | this.detailpage(); |
| 447 | - if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | ||
| 448 | - $('#myCenterBox').show(); | ||
| 449 | - } | 445 | + |
| 450 | loger.log('登录老师首页',ClassDataProxy.userType , ClassDataProxy.USER_TYPE_1) | 446 | loger.log('登录老师首页',ClassDataProxy.userType , ClassDataProxy.USER_TYPE_1) |
| 451 | 447 | ||
| 452 | $('#lanclassBox').hide(); | 448 | $('#lanclassBox').hide(); |
| 453 | - | 449 | + loger.log('显示头像数据',ClassDataProxy.userPhoto) |
| 450 | + $('#myCenterImg').attr('src',ClassDataProxy.userPhoto);//个人信息首页 | ||
| 451 | + $('#personagePortrait').attr('src',ClassDataProxy.userPhoto);//个人信息 | ||
| 454 | $('#oneselfInfoLoginName').val( ClassDataProxy.loginName);//登录名 | 452 | $('#oneselfInfoLoginName').val( ClassDataProxy.loginName);//登录名 |
| 455 | $('#oneselfInfoUserName').val(ClassDataProxy.monicker);//用户名 | 453 | $('#oneselfInfoUserName').val(ClassDataProxy.monicker);//用户名 |
| 456 | let setMail = $('#setMail');//邮箱 | 454 | let setMail = $('#setMail');//邮箱 |
| @@ -831,10 +829,9 @@ class MyCenterApe extends Ape { | @@ -831,10 +829,9 @@ class MyCenterApe extends Ape { | ||
| 831 | $('#teacherDetailBox').hide(); | 829 | $('#teacherDetailBox').hide(); |
| 832 | $('#teacherUI .recordLi').eq(2).show(); | 830 | $('#teacherUI .recordLi').eq(2).show(); |
| 833 | }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ | 831 | }else if(ClassDataProxy.userType == ClassDataProxy.USER_TYPE_1){ |
| 834 | - | ||
| 835 | - } | ||
| 836 | $('#myCenterBox').show(); | 832 | $('#myCenterBox').show(); |
| 837 | } | 833 | } |
| 834 | + } | ||
| 838 | updateEmail(userEmail){ | 835 | updateEmail(userEmail){ |
| 839 | return userEmail.replace(/(\d{2})\d{2}(\d{1})/, '$1****$2') | 836 | return userEmail.replace(/(\d{2})\d{2}(\d{1})/, '$1****$2') |
| 840 | } | 837 | } |
| @@ -26,13 +26,57 @@ class MyChangeInfoApe extends Ape { | @@ -26,13 +26,57 @@ class MyChangeInfoApe extends Ape { | ||
| 26 | $('#accountEmailBtn').on('click',this._accountEmailBtnHandler.bind(this));//邮箱 | 26 | $('#accountEmailBtn').on('click',this._accountEmailBtnHandler.bind(this));//邮箱 |
| 27 | $('#accountMobilelBtn').on('click',this._accountMobilelBtnHandler.bind(this));//手机号 | 27 | $('#accountMobilelBtn').on('click',this._accountMobilelBtnHandler.bind(this));//手机号 |
| 28 | 28 | ||
| 29 | - | 29 | + $('#personagePortraitBtn').on('change',this._personagePortraitBtnHandler.bind(this));//修改头像 |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | addEvent() { | 32 | addEvent() { |
| 33 | 33 | ||
| 34 | } | 34 | } |
| 35 | + _personagePortraitBtnHandler(){ | ||
| 36 | + let fileInput = document.getElementById('personagePortraitBtn'); | ||
| 37 | + let file = fileInput.files[0]; | ||
| 38 | + | ||
| 39 | + if (!file) { | ||
| 40 | + loger.log("没有选择文件"); | ||
| 41 | + return; | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | + let fileStr = file.name; | ||
| 45 | + if(fileStr){ | ||
| 46 | + fileStr=fileStr.toLowerCase(); | ||
| 47 | + } | ||
| 35 | 48 | ||
| 49 | + if (fileStr.lastIndexOf('.jpg') < 0 && | ||
| 50 | + fileStr.lastIndexOf('.png') < 0) { | ||
| 51 | + alert('不是有效的图片文件!'); | ||
| 52 | + return; | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + let _id = ClassDataProxy.id; | ||
| 56 | + let data = new FormData($('#personagePhotoForm')[0]); | ||
| 57 | + let _url = 'http://networkschool.xuedianyun.com:3001/upload/upLoadDoc?businessId='+_id+'&category=1' | ||
| 58 | + | ||
| 59 | + $.ajax({ | ||
| 60 | + type: "POST", | ||
| 61 | + url: _url, | ||
| 62 | + data: data, | ||
| 63 | + dataType: 'JSON', | ||
| 64 | + cache: false, | ||
| 65 | + processData: false, | ||
| 66 | + contentType: false, | ||
| 67 | + success:function(_data){ | ||
| 68 | + loger.log(_data,'成功1111') | ||
| 69 | + ClassDataProxy.getMarginTopHandler($('#warnHintBox')); | ||
| 70 | + ErrorApe.showWarnError('修改成功,请重新登录'); | ||
| 71 | + | ||
| 72 | + }.bind(this), | ||
| 73 | + error: function (_data) { | ||
| 74 | + ClassDataProxy.getMarginTopHandler($('#warnHintBox')); | ||
| 75 | + ErrorApe.showWarnError('修改失败'); | ||
| 76 | + loger.log(_data,'error') | ||
| 77 | + } | ||
| 78 | + }) | ||
| 79 | + } | ||
| 36 | //修改密码 | 80 | //修改密码 |
| 37 | _accountPassWordBtnHandler(){ | 81 | _accountPassWordBtnHandler(){ |
| 38 | this.data = 0; | 82 | this.data = 0; |
| @@ -125,6 +169,7 @@ class MyChangeInfoApe extends Ape { | @@ -125,6 +169,7 @@ class MyChangeInfoApe extends Ape { | ||
| 125 | let setPassWord = $('#setPassWord').attr('data');//密码 | 169 | let setPassWord = $('#setPassWord').attr('data');//密码 |
| 126 | let setMail = $('#setMail').attr('data');//邮箱 | 170 | let setMail = $('#setMail').attr('data');//邮箱 |
| 127 | let setPhone = $('#setPhone').attr('data');//手机号 | 171 | let setPhone = $('#setPhone').attr('data');//手机号 |
| 172 | + | ||
| 128 | let signInfo = {}; | 173 | let signInfo = {}; |
| 129 | if(oneselfInfoLoginName != loginName){ | 174 | if(oneselfInfoLoginName != loginName){ |
| 130 | signInfo.loginName = oneselfInfoLoginName; | 175 | signInfo.loginName = oneselfInfoLoginName; |
| @@ -187,11 +232,6 @@ class MyChangeInfoApe extends Ape { | @@ -187,11 +232,6 @@ class MyChangeInfoApe extends Ape { | ||
| 187 | ClassDataProxy.status = false; | 232 | ClassDataProxy.status = false; |
| 188 | 233 | ||
| 189 | } | 234 | } |
| 190 | - //个人信息 | ||
| 191 | - _updatMessage(){ | ||
| 192 | - $('#oneselfInfoLoginName').val( ClassDataProxy.loginName);//登录名 | ||
| 193 | - $('#oneselfInfoUserName').val(ClassDataProxy.monicker);//用户名 | ||
| 194 | - } | ||
| 195 | 235 | ||
| 196 | } | 236 | } |
| 197 | export default MyChangeInfoApe; | 237 | export default MyChangeInfoApe; |
| @@ -134,10 +134,12 @@ class TeacherDetailApe extends Ape { | @@ -134,10 +134,12 @@ class TeacherDetailApe extends Ape { | ||
| 134 | for(let i = 0;i<_dataList.length;i++){ | 134 | for(let i = 0;i<_dataList.length;i++){ |
| 135 | let j = (i%4)==3; | 135 | let j = (i%4)==3; |
| 136 | let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].create_time,_dataList[i].end_time) | 136 | let _getTime = ClassDataProxy.getTimeDifference(_dataList[i].create_time,_dataList[i].end_time) |
| 137 | + let _img = '../images/u373.png'; | ||
| 138 | + let _classImg = _dataList[i].meetingPhoto; | ||
| 137 | let _classifyList = this._format(classifyList,{ | 139 | let _classifyList = this._format(classifyList,{ |
| 138 | _classifyListR : j?'classifyListR':'', | 140 | _classifyListR : j?'classifyListR':'', |
| 139 | _id : _dataList[i].id, | 141 | _id : _dataList[i].id, |
| 140 | - _msgImg :'../images/u373.png', | 142 | + _msgImg :_classImg?_classImg:_img, |
| 141 | _classroomTitle : _dataList[i].user_name, | 143 | _classroomTitle : _dataList[i].user_name, |
| 142 | _schoolTime : _getTime.split('-')[0], | 144 | _schoolTime : _getTime.split('-')[0], |
| 143 | _subscribeNum :_dataList[i].reservationNumber+'人预约' | 145 | _subscribeNum :_dataList[i].reservationNumber+'人预约' |
| @@ -68,7 +68,7 @@ let _headSwitchTitleApe; | @@ -68,7 +68,7 @@ let _headSwitchTitleApe; | ||
| 68 | 68 | ||
| 69 | class Main { | 69 | class Main { |
| 70 | constructor() { | 70 | constructor() { |
| 71 | - this.clientVersion="v1.8.5.20170925"; | 71 | + this.clientVersion="v1.8.6.20170928"; |
| 72 | loger.warn("clientVersion:"+this.clientVersion); | 72 | loger.warn("clientVersion:"+this.clientVersion); |
| 73 | 73 | ||
| 74 | let locationProtocol= location.protocol; | 74 | let locationProtocol= location.protocol; |
| @@ -124,6 +124,7 @@ class Main { | @@ -124,6 +124,7 @@ class Main { | ||
| 124 | //将地址转化成一个对象 | 124 | //将地址转化成一个对象 |
| 125 | _parseUrlParams() { | 125 | _parseUrlParams() { |
| 126 | let url = encodeURI(location.search); | 126 | let url = encodeURI(location.search); |
| 127 | + loger.log('地址栏参数',location.search) | ||
| 127 | let thisParam = {}; | 128 | let thisParam = {}; |
| 128 | let strs; | 129 | let strs; |
| 129 | // 判断是否存在请求的参数 | 130 | // 判断是否存在请求的参数 |
| @@ -352,6 +353,7 @@ class Main { | @@ -352,6 +353,7 @@ class Main { | ||
| 352 | let monicker = window.localStorage.getItem('monicker')|| ''; | 353 | let monicker = window.localStorage.getItem('monicker')|| ''; |
| 353 | let status = window.localStorage.getItem('status')|| ''; | 354 | let status = window.localStorage.getItem('status')|| ''; |
| 354 | let token = window.localStorage.getItem('token')|| ''; | 355 | let token = window.localStorage.getItem('token')|| ''; |
| 356 | + let userPhoto = window.localStorage.getItem('userPhoto')|| ''; | ||
| 355 | 357 | ||
| 356 | let password = window.localStorage.getItem('password')|| ''; | 358 | let password = window.localStorage.getItem('password')|| ''; |
| 357 | 359 | ||
| @@ -365,6 +367,7 @@ class Main { | @@ -365,6 +367,7 @@ class Main { | ||
| 365 | ClassDataProxy.monicker = monicker; | 367 | ClassDataProxy.monicker = monicker; |
| 366 | ClassDataProxy.status = status; | 368 | ClassDataProxy.status = status; |
| 367 | ClassDataProxy.token = token; | 369 | ClassDataProxy.token = token; |
| 370 | + ClassDataProxy.userPhoto = userPhoto; | ||
| 368 | ClassDataProxy.password = password | 371 | ClassDataProxy.password = password |
| 369 | loger.log('进入课堂时显示的type值',ClassDataProxy.userType) | 372 | loger.log('进入课堂时显示的type值',ClassDataProxy.userType) |
| 370 | 373 |
| @@ -337,6 +337,7 @@ ClassDataProxy.userMobile = ''; | @@ -337,6 +337,7 @@ ClassDataProxy.userMobile = ''; | ||
| 337 | ClassDataProxy.userEmail = ''; | 337 | ClassDataProxy.userEmail = ''; |
| 338 | ClassDataProxy.monicker = ""; | 338 | ClassDataProxy.monicker = ""; |
| 339 | ClassDataProxy.meetingId = ''; | 339 | ClassDataProxy.meetingId = ''; |
| 340 | +ClassDataProxy.userPhoto = ''; | ||
| 340 | 341 | ||
| 341 | ClassDataProxy.USER_TYPE_0 = 0; | 342 | ClassDataProxy.USER_TYPE_0 = 0; |
| 342 | ClassDataProxy.USER_TYPE_1 = 1; | 343 | ClassDataProxy.USER_TYPE_1 = 1; |
-
请 注册 或 登录 后发表评论