Merge branch 'beta'

js/liyuan/Onload2.js

@@ -332,6 +332,7 @@ U.MD.D.error = function (errorMessage, scripturi, linenumber, columnnumber, erro
 let LoginState = false
 let CookieS = ''
 let CookieCheckTimes = 0
+let isPanL = false
 U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
@@ -720,11 +721,13 @@ U.MD.D.getuser = function () {
                 window.location.reload();
             }
         }, [], { "type": "GET", "withCredentials": true });
-    }else if(LoginState && _cookie){
+    }else if(LoginState && _cookie && !isPanL){
         CookieCheckTimes++
         if (CookieCheckTimes % 5 !== 0) return;
+        isPanL = true
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
             if (res.value && res.value[0] && res.value[0][0]) {
+                isPanL = false
             }else {
                 window.onbeforeunload = null
                 window.location.reload();

szdjg/Onload.js

@@ -316,6 +316,7 @@ U.MD.D.error = function (errorMessage, scripturi, linenumber, columnnumber, erro
  */
 let CookieS = ""
 let CookieCheckTimes = 0
+let isPanL = false
 U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
@@ -596,11 +597,13 @@ U.MD.D.getuser = function () {
                 LoginState = false
             }
         }, [], { "type": "GET", "withCredentials": true });
-    }else if(_cookie){
+    }else if(_cookie && !isPanL){
         CookieCheckTimes++
         if (CookieCheckTimes % 5 !== 0) return;
+        isPanL = true
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
             if (res.value && res.value[0] && res.value[0][0]) {
+                isPanL = false
             }else {
                 window.onbeforeunload = null
                 window.location.reload();