Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -3195,7 +3195,13 @@ window.addEventListener('message', function (e) { // 监听 message 事件
         U.MD.D.I.openInApplication("openCourseUpdate", e.data.cid)
     }else if (e.data.tools && e.data.tools == "openCourseEUpdate") {
         U.MD.D.I.openInApplication("openCourseEUpdate", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "inviteLoginSz") {
+        U.MD.D.I.openInApplication("inviteLoginSz", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "loginSz") {
+        U.MD.D.I.openInApplication("loginSz")
     }
+    
+
 });
 
 U.MD.D.I.selectUser = function () {
@@ -3454,7 +3460,18 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             _formdiv = new U.UF.UI.form(
                 "随机码登录",
                 $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/inviteLoginSZ?code=" + data }), {
-                "id": "inviteLoginSz",
+                "id": "loginSz",
+                "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            break;
+        case "loginSz":
+            _formdiv = new U.UF.UI.form(
+                "教师登录",
+                $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://edu.cocorobo.cn/ResourcesLogin" }), {
+                "id": "loginSz",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }
             }, {

js/Desktop/Onload.js

@@ -432,8 +432,8 @@ U.MD.D.getuser = function () {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
                                         US.Config.background = 'url("/img/icon/dseiBg.png")'
                                     } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-                                        US.Config.background = 'url("/img/icon/szjkyBg2.png")'
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
+                                        US.Config.background = 'url("/img/icon/szjkyBg.png")'
                                     } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
                                         US.Config.background = 'url("/img/icon/chjyjBg.png")'
@@ -553,7 +553,7 @@ U.MD.D.getuser = function () {
             } else if (userInfo.org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
             } else if (userInfo.org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
             } else if (userInfo.org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             } else if (userInfo.org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
@@ -663,8 +663,8 @@ U.MD.D.getuser2 = function (userid, cid) {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
             US.Config.background = 'url("/img/icon/dseiBg.png")'
         } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-            US.Config.background = 'url("/img/icon/szjkyBg2.png")'
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
+            US.Config.background = 'url("/img/icon/szjkyBg.png")'
         } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             US.Config.background = 'url("/img/icon/chjyjBg.png")'