Merge branch 'beta'

uform.js

@@ -11590,7 +11590,7 @@ 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')){
+        }else if(window.origin.includes('gm.cocorobo.cn') || window.location.href.includes('gm.html')){
             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,
                 {