Sfoglia il codice sorgente

Merge branch 'beta'

lsc 17 ore fa
parent
commit
a0c7d5374f
1 ha cambiato i file con 14 aggiunte e 5 eliminazioni
  1. 14 5
      js/liyuan/Onload2.js

+ 14 - 5
js/liyuan/Onload2.js

@@ -333,6 +333,7 @@ let LoginState = false
 let CookieS = ''
 let CookieCheckTimes = 0
 let isPanL = false
+let _loginInFlight = false
 U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
@@ -342,8 +343,10 @@ U.MD.D.getuser = function () {
         LoginState = true
         var _cookie = U.UF.Cookie.get("cocorobo");
         try {
-            if (!panId && _cookie && loginType != 1) {
+            if (!panId && _cookie && loginType != 1 && !_loginInFlight) {
+                _loginInFlight = true;
                 U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
+                    _loginInFlight = false;
                     if (res.value && res.value[0] && res.value[0][0]) {
                         var _user = res.value[0][0];
                         U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + _user.userid, [], function (res) {
@@ -694,12 +697,14 @@ U.MD.D.getuser = function () {
     if(LoginState && !_cookie){
         window.onbeforeunload = null
         window.location.reload();
-    }else if(LoginState && !CookieS){
+    }else if(LoginState && !CookieS && _cookie){
         CookieS = _cookie
         U.UF.Cookie.set("cocoroboLoginType=2");
-    }else if(LoginState && _cookie != CookieS){
+    }else if(LoginState && _cookie != CookieS && !_loginInFlight){
         US.userInfo = {}
+        _loginInFlight = true;
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
+            _loginInFlight = false;
             if (res.value && res.value[0] && res.value[0][0]) {
                 var _user = res.value[0][0];
                 U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + _user.userid, [], function (res) {
@@ -718,14 +723,18 @@ U.MD.D.getuser = function () {
                 }, [], { "type": "GET", "withCredentials": true });
             }else {
                 window.onbeforeunload = null
-                window.location.reload();
+                if(LoginState){
+                    window.location.reload();
+                }
             }
         }, [], { "type": "GET", "withCredentials": true });
-    }else if(LoginState && _cookie && !isPanL){
+    }else if(LoginState && _cookie && !isPanL && !_loginInFlight){
         CookieCheckTimes++
         if (CookieCheckTimes % 5 !== 0) return;
         isPanL = true
+        _loginInFlight = true;
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
+            _loginInFlight = false;
             if (res.value && res.value[0] && res.value[0][0]) {
                 isPanL = false
             }else if(res.status && res.status.status != 0){