正在显示
5 个修改的文件
包含
135 行增加
和
118 行删除
@@ -868,9 +868,9 @@ body{ | @@ -868,9 +868,9 @@ body{ | ||
868 | width:700px; | 868 | width:700px; |
869 | height: 520px; | 869 | height: 520px; |
870 | position: absolute; | 870 | position: absolute; |
871 | - left: 0; | 871 | + left:0; |
872 | + top:0; | ||
872 | right: 0; | 873 | right: 0; |
873 | - top: 0; | ||
874 | bottom: 0; | 874 | bottom: 0; |
875 | margin: auto; | 875 | margin: auto; |
876 | background: #fff; | 876 | background: #fff; |
@@ -1199,11 +1199,9 @@ body{ | @@ -1199,11 +1199,9 @@ body{ | ||
1199 | width:420px; | 1199 | width:420px; |
1200 | height: 475px; | 1200 | height: 475px; |
1201 | position: absolute; | 1201 | position: absolute; |
1202 | - left: 0; | ||
1203 | - right: 0; | ||
1204 | - top: 0; | ||
1205 | - bottom: 0; | ||
1206 | - margin: auto; | 1202 | + left: 50%; |
1203 | + right: 50%; | ||
1204 | + margin-left:-210px; | ||
1207 | background: #fff; | 1205 | background: #fff; |
1208 | } | 1206 | } |
1209 | .userLogin{ | 1207 | .userLogin{ |
@@ -1414,11 +1412,9 @@ body{ | @@ -1414,11 +1412,9 @@ body{ | ||
1414 | width:300px; | 1412 | width:300px; |
1415 | height:120px; | 1413 | height:120px; |
1416 | position: absolute; | 1414 | position: absolute; |
1417 | - left: 0; | ||
1418 | - right: 0; | ||
1419 | - top: 0; | ||
1420 | - bottom: 0; | ||
1421 | - margin: auto; | 1415 | + left: 50%; |
1416 | + right: 50%; | ||
1417 | + margin-left:-150px; | ||
1422 | z-index: 1; | 1418 | z-index: 1; |
1423 | background: #fffdfd; | 1419 | background: #fffdfd; |
1424 | cursor: default; | 1420 | cursor: default; |
@@ -1798,11 +1794,9 @@ body{ | @@ -1798,11 +1794,9 @@ body{ | ||
1798 | height:200px; | 1794 | height:200px; |
1799 | background: #fff; | 1795 | background: #fff; |
1800 | position: absolute; | 1796 | position: absolute; |
1801 | - left: 0; | ||
1802 | - right: 0; | ||
1803 | - top: 0; | ||
1804 | - bottom: 0; | ||
1805 | - margin: auto; | 1797 | + left: 50%; |
1798 | + top: 50%; | ||
1799 | + margin-left:-205px; | ||
1806 | } | 1800 | } |
1807 | .updateInputContent{ | 1801 | .updateInputContent{ |
1808 | padding: 55px 35px; | 1802 | padding: 55px 35px; |
@@ -1827,9 +1821,7 @@ body{ | @@ -1827,9 +1821,7 @@ body{ | ||
1827 | position: absolute; | 1821 | position: absolute; |
1828 | left:0; | 1822 | left:0; |
1829 | right:0; | 1823 | right:0; |
1830 | - top:0; | ||
1831 | - bottom:0; | ||
1832 | - margin:0 auto; | 1824 | + margin:auto; |
1833 | background: #fff; | 1825 | background: #fff; |
1834 | } | 1826 | } |
1835 | .createUserRole{ | 1827 | .createUserRole{ |
@@ -963,90 +963,6 @@ | @@ -963,90 +963,6 @@ | ||
963 | </div> | 963 | </div> |
964 | </div> | 964 | </div> |
965 | </div> | 965 | </div> |
966 | - <!--创建用户2级--> | ||
967 | - <div id="createUserBox" class="userSignBox createClassBox"> | ||
968 | - <div id="createUser" class="createClass createUser"> | ||
969 | - <div class="createClassHandler"> | ||
970 | - <span class="createClassHandlerTitle" id="createUserTitle">添加老师</span> | ||
971 | - <a href="javascript: void(0)" id="createUserA" class="createClassA iconfont"></a> | ||
972 | - </div> | ||
973 | - <div class="step_page1"> | ||
974 | - <div class="form_item"> | ||
975 | - <label class="step_page1Title"> | ||
976 | - 用户名: | ||
977 | - </label> | ||
978 | - <div class="step_page1_widget"> | ||
979 | - <input id="createUserName" name="createUserName" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
980 | - </div> | ||
981 | - </div> | ||
982 | - <div class="form_item"> | ||
983 | - <label class="step_page1Title"> | ||
984 | - 初始密码: | ||
985 | - </label> | ||
986 | - <div class="step_page1_widget"> | ||
987 | - <input id="createUserPassWord" name="createUserPassWord" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入主持人密码" value=""> | ||
988 | - </div> | ||
989 | - </div> | ||
990 | - <div class="form_item"> | ||
991 | - <label class="step_page1Title"> | ||
992 | - 真实姓名: | ||
993 | - </label> | ||
994 | - <div class="step_page1_widget"> | ||
995 | - <input id="createUserRealName" name="createUserRealName" type="password" class="classThemeInfo classThemeInfo1" placeholder="输入课堂密码"> | ||
996 | - </div> | ||
997 | - </div> | ||
998 | - <div class="form_item form_item2"> | ||
999 | - <label class="step_page1Title"> | ||
1000 | - 角色: | ||
1001 | - </label> | ||
1002 | - <div class="step_page1_widget"> | ||
1003 | - <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="1" checked="checked"> | ||
1004 | - <label for="createUserTeacher" class="publicInfo"> | ||
1005 | - 老师 | ||
1006 | - </label> | ||
1007 | - <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="0"> | ||
1008 | - <label for="createUserTeaching" class="publicInfo"> | ||
1009 | - 兼课 | ||
1010 | - </label> | ||
1011 | - </div> | ||
1012 | - </div> | ||
1013 | - <div class="form_item"> | ||
1014 | - <label class="step_page1Title"> | ||
1015 | - 身份证号: | ||
1016 | - </label> | ||
1017 | - <div class="step_page1_widget"> | ||
1018 | - <input id="createUserIdentity" name="createUserIdentity" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
1019 | - </div> | ||
1020 | - </div> | ||
1021 | - <div class="form_item"> | ||
1022 | - <label class="step_page1Title"> | ||
1023 | - 邮箱地址: | ||
1024 | - </label> | ||
1025 | - <div class="step_page1_widget"> | ||
1026 | - <input id="createUserMail" name="classThemeUserName" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
1027 | - </div> | ||
1028 | - </div> | ||
1029 | - <div class="form_item"> | ||
1030 | - <label class="step_page1Title"> | ||
1031 | - 备注信息: | ||
1032 | - </label> | ||
1033 | - <div class="step_page1_widget"> | ||
1034 | - <textarea id="createUserNote" class="classDescribeArea"></textarea> | ||
1035 | - </div> | ||
1036 | - </div> | ||
1037 | - <div class="form_item"> | ||
1038 | - <label class="step_page1Title"> | ||
1039 | - 有效期至: | ||
1040 | - </label> | ||
1041 | - <div id="createUserAbortTime" class="createUserAbortTime"></div> | ||
1042 | - </div> | ||
1043 | - </div> | ||
1044 | - <div class="form_button"> | ||
1045 | - <input id="createUserConfirm" type="button" value="确定" class="createClassBtn createClassConfirm btnHover"> | ||
1046 | - <span id="createUserCancel" class="createClassBtn main_closeBtn">取消</span> | ||
1047 | - </div> | ||
1048 | - </div> | ||
1049 | - </div> | ||
1050 | <!--个人中心--> | 966 | <!--个人中心--> |
1051 | <div id="myCenterBox" class="myCenterBox"> | 967 | <div id="myCenterBox" class="myCenterBox"> |
1052 | <div class="myCenterLeftBox"> | 968 | <div class="myCenterLeftBox"> |
@@ -1389,6 +1305,90 @@ | @@ -1389,6 +1305,90 @@ | ||
1389 | </div> | 1305 | </div> |
1390 | </div> | 1306 | </div> |
1391 | </div> | 1307 | </div> |
1308 | + <!--创建用户2级--> | ||
1309 | + <div id="createUserBox" class="userSignBox createClassBox"> | ||
1310 | + <div id="createUser" class="createClass createUser"> | ||
1311 | + <div class="createClassHandler"> | ||
1312 | + <span class="createClassHandlerTitle" id="createUserTitle">添加老师</span> | ||
1313 | + <a href="javascript: void(0)" id="createUserA" class="createClassA iconfont"></a> | ||
1314 | + </div> | ||
1315 | + <div class="step_page1"> | ||
1316 | + <div class="form_item"> | ||
1317 | + <label class="step_page1Title"> | ||
1318 | + 用户名: | ||
1319 | + </label> | ||
1320 | + <div class="step_page1_widget"> | ||
1321 | + <input id="createUserName" name="createUserName" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
1322 | + </div> | ||
1323 | + </div> | ||
1324 | + <div class="form_item"> | ||
1325 | + <label class="step_page1Title"> | ||
1326 | + 初始密码: | ||
1327 | + </label> | ||
1328 | + <div class="step_page1_widget"> | ||
1329 | + <input id="createUserPassWord" name="createUserPassWord" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入主持人密码" value=""> | ||
1330 | + </div> | ||
1331 | + </div> | ||
1332 | + <div class="form_item"> | ||
1333 | + <label class="step_page1Title"> | ||
1334 | + 真实姓名: | ||
1335 | + </label> | ||
1336 | + <div class="step_page1_widget"> | ||
1337 | + <input id="createUserRealName" name="createUserRealName" type="password" class="classThemeInfo classThemeInfo1" placeholder="输入课堂密码"> | ||
1338 | + </div> | ||
1339 | + </div> | ||
1340 | + <div class="form_item form_item2"> | ||
1341 | + <label class="step_page1Title"> | ||
1342 | + 角色: | ||
1343 | + </label> | ||
1344 | + <div class="step_page1_widget"> | ||
1345 | + <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeacher" value="1" checked="checked"> | ||
1346 | + <label for="createUserTeacher" class="publicInfo"> | ||
1347 | + 老师 | ||
1348 | + </label> | ||
1349 | + <input class="allowPublic" type="radio" name="createUserTeacher" id="createUserTeaching" value="0"> | ||
1350 | + <label for="createUserTeaching" class="publicInfo"> | ||
1351 | + 兼课 | ||
1352 | + </label> | ||
1353 | + </div> | ||
1354 | + </div> | ||
1355 | + <div class="form_item"> | ||
1356 | + <label class="step_page1Title"> | ||
1357 | + 身份证号: | ||
1358 | + </label> | ||
1359 | + <div class="step_page1_widget"> | ||
1360 | + <input id="createUserIdentity" name="createUserIdentity" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
1361 | + </div> | ||
1362 | + </div> | ||
1363 | + <div class="form_item"> | ||
1364 | + <label class="step_page1Title"> | ||
1365 | + 邮箱地址: | ||
1366 | + </label> | ||
1367 | + <div class="step_page1_widget"> | ||
1368 | + <input id="createUserMail" name="classThemeUserName" type="text" class="classThemeInfo classThemeInfo1" placeholder="输入课堂主题" value=""> | ||
1369 | + </div> | ||
1370 | + </div> | ||
1371 | + <div class="form_item"> | ||
1372 | + <label class="step_page1Title"> | ||
1373 | + 备注信息: | ||
1374 | + </label> | ||
1375 | + <div class="step_page1_widget"> | ||
1376 | + <textarea id="createUserNote" class="classDescribeArea"></textarea> | ||
1377 | + </div> | ||
1378 | + </div> | ||
1379 | + <div class="form_item"> | ||
1380 | + <label class="step_page1Title"> | ||
1381 | + 有效期至: | ||
1382 | + </label> | ||
1383 | + <div id="createUserAbortTime" class="createUserAbortTime"></div> | ||
1384 | + </div> | ||
1385 | + </div> | ||
1386 | + <div class="form_button"> | ||
1387 | + <input id="createUserConfirm" type="button" value="确定" class="createClassBtn createClassConfirm btnHover"> | ||
1388 | + <span id="createUserCancel" class="createClassBtn main_closeBtn">取消</span> | ||
1389 | + </div> | ||
1390 | + </div> | ||
1391 | + </div> | ||
1392 | </div> | 1392 | </div> |
1393 | <div class="footerBg"> | 1393 | <div class="footerBg"> |
1394 | <div class="footer"> | 1394 | <div class="footer"> |
@@ -14,10 +14,10 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | @@ -14,10 +14,10 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | ||
14 | <th width="8%" class="tr_center"> | 14 | <th width="8%" class="tr_center"> |
15 | 课堂主题 | 15 | 课堂主题 |
16 | </th> | 16 | </th> |
17 | - <th width="9%" class="tr_center"> | 17 | + <th width="8%" class="tr_center"> |
18 | 课堂号 | 18 | 课堂号 |
19 | </th> | 19 | </th> |
20 | - <th width="8%" class="tr_center"> | 20 | + <th width="7%" class="tr_center"> |
21 | 老师 | 21 | 老师 |
22 | </th> | 22 | </th> |
23 | <th width="6%" class="tr_center"> | 23 | <th width="6%" class="tr_center"> |
@@ -36,13 +36,13 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | @@ -36,13 +36,13 @@ const adminListTit = `<table width="100%" align="center" cellpadding="0" cellspa | ||
36 | `; | 36 | `; |
37 | //管理首页 | 37 | //管理首页 |
38 | const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor="#e6e6e6"> | 38 | const adminList = `<tr align="center" bgcolor="#FFFFFF" height="44" bordercolor="#e6e6e6"> |
39 | - <td width="8%" class="tr_main tr_mainLeft">{_meetingName}</td> | ||
40 | - <td width="8%" class="tr_main">{_esenglish}</td> | ||
41 | - <td width="8%" class="tr_main">{_userName}</td> | 39 | + <td width="7%" class="tr_main tr_mainLeft">{_meetingName}</td> |
40 | + <td width="7%" class="tr_main">{_esenglish}</td> | ||
41 | + <td width="7%" class="tr_main">{_userName}</td> | ||
42 | <td width="6%" class="tr_main">{_stateInfo}</td> | 42 | <td width="6%" class="tr_main">{_stateInfo}</td> |
43 | <td width="18%" class="tr_main">{_time}</td> | 43 | <td width="18%" class="tr_main">{_time}</td> |
44 | - <td width="4%" class="tr_main">{_onlineLen}</td> | ||
45 | - <td width="20%" class="tr_main tr_mainRight" align="center" > | 44 | + <td width="6%" class="tr_main">{_onlineLen}</td> |
45 | + <td width="18%" class="tr_main tr_mainRight" align="center" > | ||
46 | <a id="{_DocInd}" class="classHandlePort" href="###">文档</a> | 46 | <a id="{_DocInd}" class="classHandlePort" href="###">文档</a> |
47 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> | 47 | <a id="{_mediaInd}" class="classHandlePort" href="###">多媒体</a> |
48 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> | 48 | <a id="{_musicInd}" class="classHandlePort" href="###">伴音</a> |
@@ -51,12 +51,10 @@ class CreateClassApe extends Ape { | @@ -51,12 +51,10 @@ class CreateClassApe extends Ape { | ||
51 | 51 | ||
52 | } | 52 | } |
53 | isLocalStorage(){ | 53 | isLocalStorage(){ |
54 | - let newDate = new Date(); | ||
55 | - let ysar = newDate.getFullYear(); | ||
56 | - let month = newDate.getMonth()+1;//月 | ||
57 | - let date = newDate.getDate();//日 | ||
58 | - | ||
59 | - | 54 | + //设置当前时间 给输入框默认值 |
55 | + this._setNewTime(); | ||
56 | + //设置弹框位置 | ||
57 | + this._setMarginTop(); | ||
60 | } | 58 | } |
61 | _showPresentTime(){ | 59 | _showPresentTime(){ |
62 | let newDate = new Date(); | 60 | let newDate = new Date(); |
@@ -338,6 +336,33 @@ class CreateClassApe extends Ape { | @@ -338,6 +336,33 @@ class CreateClassApe extends Ape { | ||
338 | $('#createUserAccountBox').hide(); | 336 | $('#createUserAccountBox').hide(); |
339 | $('#createUserBox').show(); | 337 | $('#createUserBox').show(); |
340 | } | 338 | } |
339 | + //设置当前时间 给输入框默认值 | ||
340 | + _setNewTime(){ | ||
341 | + let newDate = new Date(); | ||
342 | + let ysar = newDate.getFullYear(); | ||
343 | + let month = newDate.getMonth()+1;//月 | ||
344 | + let date = newDate.getDate();//日 | ||
345 | + month<10?'0'+month:month; | ||
346 | + date<10?'0'+date:date; | ||
347 | + let time = ysar+'-'+month+'-'+date; | ||
348 | + $('#liveInfoCenterLiveStart').html(time); | ||
349 | + $('#liveInfoCenterLiveEnd').html(time); | ||
350 | + $('#createUserAbortTime').html(time); | ||
351 | + } | ||
352 | + //设置弹框位置 | ||
353 | + _setMarginTop(){ | ||
354 | + this._setMarginTopHandler($('#createUserAccount'));//创建用户选择身份 | ||
355 | + this._setMarginTopHandler($('#userLogin'));//登录 | ||
356 | + this._setMarginTopHandler($('#usersign'));//注册 | ||
357 | + this._setMarginTopHandler($('#warnHintBox'));//错误提示 | ||
358 | + this._setMarginTopHandler($('#removeHandler'));//删除 | ||
359 | + this._setMarginTopHandler($('#updateInputBox'));//修改信息输入框 | ||
360 | + } | ||
361 | + //设置弹框位置 方法 | ||
362 | + _setMarginTopHandler(_data){ | ||
363 | + let clienth = document.documentElement.clientHeight || document.body.clientHeight | ||
364 | + _data.css('margin-top',(clienth - parseInt(_data.height()))/2) | ||
365 | + } | ||
341 | _dateUI(){ | 366 | _dateUI(){ |
342 | //执行一个laydate实例 | 367 | //执行一个laydate实例 |
343 | dateUI.render({ | 368 | dateUI.render({ |
@@ -38,7 +38,7 @@ let _subscribeApe; | @@ -38,7 +38,7 @@ let _subscribeApe; | ||
38 | 38 | ||
39 | class Main { | 39 | class Main { |
40 | constructor() { | 40 | constructor() { |
41 | - this.clientVersion="v1.6.8.20170904"; | 41 | + this.clientVersion="v1.6.9.20170904"; |
42 | loger.warn("clientVersion:"+this.clientVersion); | 42 | loger.warn("clientVersion:"+this.clientVersion); |
43 | 43 | ||
44 | let locationProtocol= location.protocol; | 44 | let locationProtocol= location.protocol; |
-
请 注册 或 登录 后发表评论