Merge branch 'beta'

js/liyuan/Onload.js

@@ -33,7 +33,7 @@ U.MD.D.LocalStorage = null;
  */
 window.onload = function () {
     U.MD.D.Load();
-    U.MD.U.L.login();
+    // U.MD.U.L.login();
     //U.MD.D.isLogin();
     // U.MD.D.fullscreen();
     U.MD.D.stopSafari();

js/liyuan/Onload2.js

@@ -33,7 +33,7 @@ U.MD.D.LocalStorage = null;
  */
 window.onload = function () {
     U.MD.D.Load();
-    U.MD.U.L.login();
+    // U.MD.U.L.login();
     //U.MD.D.isLogin();
     // U.MD.D.fullscreen();
     U.MD.D.stopSafari();

uform.js

@@ -11611,7 +11611,7 @@ U.MD.U.L.login = U.MD.U.L.DLTC = function (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" });
+            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://classlogin.cocorobo.cn/" });
             new U.UF.UI.form("", _iframe,
                 {
                     "id": "U_MD_HomeC_Pop",
@@ -11990,6 +11990,23 @@ U.MD.U.LO.logoutSystem = function (callback) {
     }
 }
 
+/**
+* 强制退出登录提示
+*
+* @param callback {function} 登出回调函数
+*/
+U.MD.U.LO.logoutSystemQ = function (callback) {
+    //如果用户登录的情况
+    if (US.userInfo.userid) {
+        //弹出退出登录的提示
+        U.A.Request(US.Config.server + "logout", [], function (res) {
+                U.alert("退出成功!")
+                window.onbeforeunload = null
+                window.location.reload();
+        }, [], { "type": "POST", "withCredentials": true });
+    }
+}
+
 /**
 * 禁止登录 执行推出
 *