update

js/Desktop/Onload.js

@@ -33,7 +33,7 @@ U.MD.D.LocalStorage = null;
  */
 window.onload = function () {
     U.MD.D.Load();
-    U.MD.D.isLogin();
+    //U.MD.D.isLogin();
 }
 
 
@@ -198,7 +198,10 @@ U.MD.D.asynCrossDomain = function (cb) {
     if (U.UF.C.isFunction(cb)) {
         cb(); //回调处理
     }
-    U.MD.D.getuser(); //用户登录
+    setInterval(function () {
+        U.MD.D.getuser(); //用户登录
+    }, 2000)
+
 }
 
 /**
@@ -292,13 +295,12 @@ U.MD.D.getuser = function () {
                     U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + _user.userid, [], function (res) {
                         if (res.value && res.value[0] && res.value[0][0]) {
                             US.userInfo = res.value[0][0]; //记录用户数据
-                            U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+                            US.userInfo.userid = _user.userid;
                             if ($("#U_MD_HomeC_Pop")[0]) {
                                 $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
                             }
                             U.A.Request(US.Config.pbl + "selectUser?userid=" + _user.userid, [], function (res) {//US.userInfo.userid
                                 if (res.value == null || res.value[0].length == 0) {
-                                    U.MD.D.isLogin();
                                     U.MD.D.I.openApplication("my")
                                 }
                                 else {
@@ -310,8 +312,10 @@ U.MD.D.getuser = function () {
                                     $(".avatar")[0].style.display = "block";
                                     $(".exit")[0].style.display = "block";
                                 }
+                                U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }
+
                     }, [], { "type": "GET", "withCredentials": true });
                 }
             }, [], { "type": "GET", "withCredentials": true });
@@ -320,26 +324,6 @@ U.MD.D.getuser = function () {
 }
 
 
-/**
- * 弹出登录判断
- */
-U.MD.D.isLogin = function () {
-    var userInfo = US.userInfo;
-    if (!userInfo || Object.keys(userInfo).length === 0) {
-        $(".userName")[0].style.display = "none";
-        setTimeout(() => {
-            U.MD.U.L.login();
-        }, 2000);
-    } else {
-        $(".login")[0].style.display = "none";
-        $(".register")[0].style.display = "none";
-        $(".userName")[0].style.display = "block";
-        $(".userName")[0].innerHTML = userInfo.alias;
-        $(".exit")[0].style.display = "block";
-    }
-}
-
-
 //#endregion
 
 //#region 获取ifram下的html