update

js/Desktop/Onload.js

@@ -317,9 +317,10 @@ let LoginState = false
 U.MD.D.getuser = function () {
     // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gif/longhuaBg.gif")'
     var userInfo = US.userInfo;
-    if (Object.keys(userInfo).length === 0 && !U.UF.C.queryString('code') && !U.UF.C.queryString('tycode')) {
+    var panId = userInfo && userInfo.organizeid
+    if (!panId && !U.UF.C.queryString('code') && !U.UF.C.queryString('tycode')) {
         var _cookie = U.UF.Cookie.get("cocorobo");
-        if (Object.keys(userInfo).length === 0 && _cookie) {
+        if (!panId && _cookie) {
             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];
@@ -339,7 +340,7 @@ U.MD.D.getuser = function () {
                 }
             }, [], { "type": "GET", "withCredentials": true });
         }
-    }else if(!LoginState &&Object.keys(userInfo).length === 0 && U.UF.C.queryString('code').length === 32){
+    }else if(!LoginState &&!panId && U.UF.C.queryString('code').length === 32){
         if($("#U_MD_HomeC_Pop")[0]){
             $("#U_MD_HomeC_Pop")[0].close()
         }
@@ -412,7 +413,7 @@ U.MD.D.getuser = function () {
             LoginState = false
             console.log('error', error)
         });
-    }else if(!LoginState &&Object.keys(userInfo).length === 0 && U.UF.C.queryString('code').length < 32 && U.UF.C.queryString('code').length > 9){
+    }else if(!LoginState &&!panId && U.UF.C.queryString('code').length < 32 && U.UF.C.queryString('code').length > 9){
         if($("#U_MD_HomeC_Pop")[0]){
             $("#U_MD_HomeC_Pop")[0].close()
         }
@@ -476,7 +477,7 @@ U.MD.D.getuser = function () {
             LoginState = false
             console.log('error', error)
         });
-    }else if(!LoginState &&Object.keys(userInfo).length === 0 && U.UF.C.queryString('tycode')){
+    }else if(!LoginState &&!panId && U.UF.C.queryString('tycode')){
         U.UF.DL.loading(document.body)
         if($("#U_MD_HomeC_Pop")[0]){
             $("#U_MD_HomeC_Pop")[0].close()
@@ -546,106 +547,115 @@ U.MD.D.getuser = function () {
             LoginState = false
             console.log('error', error)
         });
-    } else if(Object.keys(userInfo).length !== 0){
-        if(US.Config.type == '2'){
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/easyBg.png")'
-
-            if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
-                U.MD.D.getNotice();
-            }else if (userInfo.org == '150e3120-9195-11ed-b13d-005056b86db5') {
-                U.MD.D.getNotice();
-            } else if (userInfo.org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
-                U.MD.D.getNotice();
-            }
-        }else{
-            if (userInfo.organizeid == '91305d49-01ba-11ed-8c78-005056b86db4') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")'
-            } else if (userInfo.organizeid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhongshanBg.png")'
-            } else if (userInfo.organizeid == '580aac24-a939-49f7-a75a-40a7b5af3a17') {
-                // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
-            } else if (userInfo.organizeid == 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")'
-            } else if (userInfo.organizeid == '857af1c7-c8ee-4b04-85b5-fd182903adb7') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")'
-            } else if (userInfo.organizeid == '69893dca-1d47-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")'
-            } else if (userInfo.organizeid == 'efdef564-4064-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")'
-            } else if (userInfo.organizeid == 'd9db3320-503a-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")'
-            } else if (userInfo.organizeid == 'ccb9754d-59c1-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-            } else if (userInfo.organizeid == 'f30a6615-5379-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")'
-            } else if (userInfo.organizeid == '4787cc87-6588-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
-            } else if (userInfo.organizeid == '9f888eae-7558-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")'
-            } else if (userInfo.organizeid == '2b9ceb66-a1dd-11ed-b13d-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")'
-            } else if (userInfo.organizeid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
-            } else if (userInfo.organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
-            } else if (userInfo.organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
-            } else if (userInfo.organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
-            } else if (userInfo.organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
-            }
-            
-            if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
-            } else if (userInfo.org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")'
-            } else if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")'
-                U.MD.D.getNotice();
-            } else if (userInfo.org == '97c4ee8b-d010-4042-986d-e9d3c217264f') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")'
-            } else if (userInfo.org == '150e3120-9195-11ed-b13d-005056b86db5') {
-                if (!$("#tc_desktop_css")[0]) {
-                    const link = document.createElement("link");
-                    link.rel = "stylesheet";
-                    link.href =
-                        "./css/tencent/Desktop.css";
-                    link.id = "tc_desktop_css"
-                    document.body.appendChild(link);
+    } else if(panId){
+        try {
+            if(US.Config.type == '2'){
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/easyBg.png")'
+    
+                if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
+                    U.MD.D.getNotice();
+                }else if (userInfo.org == '150e3120-9195-11ed-b13d-005056b86db5') {
+                    U.MD.D.getNotice();
+                } else if (userInfo.org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
+                    U.MD.D.getNotice();
+                }
+            }else{
+                if (userInfo.organizeid == '91305d49-01ba-11ed-8c78-005056b86db4') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/mingdeBg.png")'
+                } else if (userInfo.organizeid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhongshanBg.png")'
+                } else if (userInfo.organizeid == '580aac24-a939-49f7-a75a-40a7b5af3a17') {
+                    // $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longweiBg.png")'
+                } else if (userInfo.organizeid == 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yunhaiBg.jpg")'
+                } else if (userInfo.organizeid == '857af1c7-c8ee-4b04-85b5-fd182903adb7') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/beijingBg.png")'
+                } else if (userInfo.organizeid == '69893dca-1d47-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/weilaiBg.png")'
+                } else if (userInfo.organizeid == 'efdef564-4064-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/pz.jpg")'
+                } else if (userInfo.organizeid == 'd9db3320-503a-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/hzBg.png")'
+                } else if (userInfo.organizeid == 'ccb9754d-59c1-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
+                } else if (userInfo.organizeid == 'f30a6615-5379-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaBg.png")'
+                } else if (userInfo.organizeid == '4787cc87-6588-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/nanfangBg.png")'
+                } else if (userInfo.organizeid == '9f888eae-7558-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/song.png")'
+                } else if (userInfo.organizeid == '2b9ceb66-a1dd-11ed-b13d-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gmxxBg.png")'
+                } else if (userInfo.organizeid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
+                } else if (userInfo.organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
+                } else if (userInfo.organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
+                } else if (userInfo.organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
+                } else if (userInfo.organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
+                }
+                
+                if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
+                } else if (userInfo.org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/csteamBg.png")'
+                } else if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gm/bg.png")'
+                    U.MD.D.getNotice();
+                } else if (userInfo.org == '97c4ee8b-d010-4042-986d-e9d3c217264f') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/zhoujia.jpg")'
+                } else if (userInfo.org == '150e3120-9195-11ed-b13d-005056b86db5') {
+                    if (!$("#tc_desktop_css")[0]) {
+                        const link = document.createElement("link");
+                        link.rel = "stylesheet";
+                        link.href =
+                            "./css/tencent/Desktop.css";
+                        link.id = "tc_desktop_css"
+                        document.body.appendChild(link);
+                        $(".avatar")[0].onclick= function(){
+                            U.MD.D.I.openApplication('tcData')
+                        }
+                    }
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")'
+                    U.MD.D.getNotice();
+                } else if (userInfo.org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
                     $(".avatar")[0].onclick= function(){
                         U.MD.D.I.openApplication('tcData')
                     }
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")'
+                    U.MD.D.getNotice();
+                } else if (userInfo.org == 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
+                } else if (userInfo.org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
+                } else if (userInfo.org == '54f09f1e-09f0-11ee-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")'
+                } else if (userInfo.org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
+                } else if (userInfo.org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+                } else if (userInfo.org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
+                } else if (userInfo.org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
+                } else if (userInfo.org == '884c5665-a453-46f3-b7b6-01d575290aa9') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")'
+                } else if (userInfo.org == '2fe1a080-4425-4620-b7a0-be2f3750ffd4') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/x010607bgImg.png")'
+                } else if (userInfo.org == 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3') {
+                    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/SPROUTLabBg.png")'
                 }
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/tencentBg.jpg")'
-                U.MD.D.getNotice();
-            } else if (userInfo.org == 'ee40e8e3-e36c-4872-8105-cf395481012s') {
-                $(".avatar")[0].onclick= function(){
-                    U.MD.D.I.openApplication('tcData')
-                }
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szscBg.png")'
-                U.MD.D.getNotice();
-            } else if (userInfo.org == 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-            } else if (userInfo.org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
-            } else if (userInfo.org == '54f09f1e-09f0-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szlhyjBg.jpeg")'
-            } else if (userInfo.org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
-            } else if (userInfo.org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
-            } else if (userInfo.org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
-            } else if (userInfo.org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
-            } else if (userInfo.org == '884c5665-a453-46f3-b7b6-01d575290aa9') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/scnuaiBg.png")'
-            } else if (userInfo.org == '2fe1a080-4425-4620-b7a0-be2f3750ffd4') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/x010607bgImg.png")'
-            } else if (userInfo.org == 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/SPROUTLabBg.png")'
             }
+        } catch (error) {
+            if ($("#U_MD_HomeC_Pop")[0]) {
+                $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
+            }
+            selectUser(userInfo.userid, (res) => {
+              loginSet(res.value[0][0], res);
+            });
         }
     }
 }

js/app/Onload.js

@@ -320,7 +320,7 @@ U.MD.D.getuser = function () {
     var panId = userInfo && userInfo.organizeid
     if (!panId && !U.UF.C.queryString('code') && !U.UF.C.queryString('tycode')) {
         var _cookie = U.UF.Cookie.get("cocorobo");
-        if (Object.keys(userInfo).length === 0 && _cookie) {
+        if (!panId && _cookie) {
             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];