Merge branch 'beta'

js/Desktop/Onload.js

@@ -683,6 +683,7 @@ U.MD.D.getuser = function () {
         window.location.reload();
     }else if(LoginState && !CookieS){
         CookieS = _cookie
+        U.UF.Cookie.set("cocoroboLoginType=1");
     }else if(LoginState && _cookie != CookieS){
         US.userInfo = {}
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
@@ -696,6 +697,7 @@ U.MD.D.getuser = function () {
                         selectUser(_user.userid, (res) => {
                           loginSet(res.value[0][0], res);
                         });
+                        U.UF.Cookie.set("cocoroboLoginType=1");
                     }else {
                         LoginState = false
                     }

js/liyuan/Onload.js

@@ -321,11 +321,12 @@ U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
     var panId = userInfo && userInfo.accountNumber
+    let loginType = U.UF.Cookie.get("cocoroboLoginType");
     if (!LoginState && !panId && !U.UF.C.queryString('code') && !U.UF.C.queryString('tycode')) {
         LoginState = true
         var _cookie = U.UF.Cookie.get("cocorobo");
         try {
-            if (!panId && _cookie) {
+            if (!panId && _cookie && loginType != 1) {
                 U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
                     if (res.value && res.value[0] && res.value[0][0]) {
                         var _user = res.value[0][0];
@@ -679,6 +680,7 @@ U.MD.D.getuser = function () {
         window.location.reload();
     }else if(LoginState && !CookieS){
         CookieS = _cookie
+        U.UF.Cookie.set("cocoroboLoginType=2");
     }else if(LoginState && _cookie != CookieS){
         US.userInfo = {}
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
@@ -695,6 +697,7 @@ U.MD.D.getuser = function () {
                     }else {
                         LoginState = false
                     }
+                    U.UF.Cookie.set("cocoroboLoginType=2");
 
                 }, [], { "type": "GET", "withCredentials": true });
             }else {

js/liyuan/Onload2.js

@@ -321,11 +321,12 @@ U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
     var panId = userInfo && userInfo.accountNumber
+    let loginType = U.UF.Cookie.get("cocoroboLoginType");
     if (!LoginState && !panId && !U.UF.C.queryString('code') && !U.UF.C.queryString('tycode')) {
         LoginState = true
         var _cookie = U.UF.Cookie.get("cocorobo");
         try {
-            if (!panId && _cookie) {
+            if (!panId && _cookie && loginType != 1) {
                 U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
                     if (res.value && res.value[0] && res.value[0][0]) {
                         var _user = res.value[0][0];
@@ -679,6 +680,7 @@ U.MD.D.getuser = function () {
         window.location.reload();
     }else if(LoginState && !CookieS){
         CookieS = _cookie
+        U.UF.Cookie.set("cocoroboLoginType=2");
     }else if(LoginState && _cookie != CookieS){
         US.userInfo = {}
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
@@ -692,6 +694,7 @@ U.MD.D.getuser = function () {
                         selectUser(_user.userid, (res) => {
                           loginSet(res.value[0][0], res);
                         });
+                        U.UF.Cookie.set("cocoroboLoginType=2");
                     }else {
                         LoginState = false
                     }