Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -7068,7 +7068,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "aigpt": //gpt4
             _formdiv = new U.UF.UI.form(
                 "AI助手+",
-                $$("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://cloud.cocorobo.cn/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                $$("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://beta.cloud.cocorobo.cn/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "aigpt",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { }
@@ -7456,6 +7456,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
     // if(iframeBool){
     //     U.UF.DL.loading($("iframe", _formdiv)[0].parentElement.parentElement)
     //     let onloadListener = $("iframe", _formdiv)[0].onload = () => {
+    //         console.log("iframe进入");
     //         U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
     //     };
     // }

uform.js

@@ -11590,6 +11590,27 @@ U.MD.U.L.login = U.MD.U.L.DLTC = function (fun) {
                     isenlarge: false,
                     isnarrow: false
                 }, { "style": { "height": "36px" } });
+        }else if(window.origin.includes('gm.cocorobo.cn')){
+            var _iframe = $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "id": "UI_Login", "name": "UI_Login", "frameborder": "no", "border": "0", "scrolling ": "no", "width": "360px", "height": "480px", "src": "https://edu.cocorobo.cn/course/userVerify?type=2" });
+            new U.UF.UI.form("", _iframe,
+                {
+                    "id": "U_MD_HomeC_Pop",
+                    "style": { "width": "500px", "height": "90%", "overflow": 'hidden' },
+                },
+                {
+                    isdrag: false,
+                    isstretching: false,
+                    isenlarge: false,
+                    isnarrow: false
+                });
+            //跨域回调设置
+            U.UF.DL.iframeLoad(_iframe, function () {
+                //登录有的其他回调，如，登陆后直接打开好友聊天等
+                if (U.UF.C.isFunction(fun)) {
+                    U.MD.U.L.loginCallBack = fun; //回调处理
+                }
+                _iframe.contentWindow.U.MD.U.L.loginCallBack = U.MD.U.L.defaultCallBack; //设置登录回调
+            });
         } else {
             var _iframe = $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "id": "UI_Login", "name": "UI_Login", "frameborder": "no", "border": "0", "scrolling ": "no", "width": "360px", "height": "480px", "src": "https://edu.cocorobo.cn/course/login?type=2" });
             new U.UF.UI.form("", _iframe,