Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -2076,7 +2076,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _scnuaiStudentDeskIconInfo = U.MD.D.I.scnuaiStudentDeskIcon, //scnuai
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //szsc
     var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5', '2f30fe58-a94f-11ee-b534-005056b86db5', 'eaba9110-d1eb-11ee-b534-005056b86db5','c7df0bd4-6e75-401a-a137-4e163aa62263','8a352da2-56e1-11ef-b873-005056b86db5','9b46a3c9-7657-11ef-9b30-005056b86db5','857af1c7-c8ee-4b04-85b5-fd182903adb7','876030db-7a49-11ef-9b30-005056b86db5','b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5','6c16df93-8849-11ef-9b30-005056b86db5','72c16ee0-89fe-11ef-9b30-005056b86db5','369222a8-cddd-11ed-9546-005056b86db5','3fc7840d-a1c4-11ef-9b30-005056b86db5'];
-    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5', '63060b4a-89dc-4f0c-bf04-a1de22d479ff', '777559d2-7239-11ee-b98c-005056b86db5', '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344','884c5665-a453-46f3-b7b6-01d575290aa9','c9a6de59-8b4f-4be1-8565-a08081f649d3','7f280060-665e-4868-b68f-1eec9e1b4a07','f3b243b2-75e2-4b00-8f66-7644946a2a25','16ace517-b5c7-4168-a9bb-a9e0035df840','2fe1a080-4425-4620-b7a0-be2f3750ffd4','a5efd078-20f6-4185-bef9-6d1c688bee70','23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6','ec84034b-8ea4-4d27-9cba-1adcb4720bb3'];
+    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5', '63060b4a-89dc-4f0c-bf04-a1de22d479ff', '777559d2-7239-11ee-b98c-005056b86db5', '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344','884c5665-a453-46f3-b7b6-01d575290aa9','c9a6de59-8b4f-4be1-8565-a08081f649d3','7f280060-665e-4868-b68f-1eec9e1b4a07','f3b243b2-75e2-4b00-8f66-7644946a2a25','16ace517-b5c7-4168-a9bb-a9e0035df840','2fe1a080-4425-4620-b7a0-be2f3750ffd4','a5efd078-20f6-4185-bef9-6d1c688bee70','23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6','ec84034b-8ea4-4d27-9cba-1adcb4720bb3','b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc'];
     //清楚桌面图标
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
@@ -2710,7 +2710,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010611StudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010611StudentDeskIconInfo[i].Name }, _iconcontent);
             }
-        } else if (_type == 2 && (_oid == "e5cdf6b8-abdc-11ef-b887-005056b86db5")) {
+        } else if (_type == 2 && (_org == "b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc")) {
             for (i = 0; i < _tianyuantudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
                     className: "U_MD_D_KO",
@@ -4272,7 +4272,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010611TeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010611TeacherDeskIconInfo[i].Name }, _iconcontent);
             }
-        } else if ((_type == 1 || _type == 4) && _oid == "e5cdf6b8-abdc-11ef-b887-005056b86db5") {
+        } else if ((_type == 1 || _type == 4) && _org == "b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc") {
             for (i = 0; i < _tianyuanTeacherDeskIconInfo.length; i++) {
                 if(_role === 0 && _tianyuanTeacherDeskIconInfo[i].Url == 'testTeacher'){
                     continue

js/Desktop/Onload.js

@@ -502,7 +502,7 @@ U.MD.D.getuser = function () {
             let data = JSON.parse(result).data
             // return
             if(JSON.parse(result).code == 200){
-                U.A.Request(US.Config.pbl + "batchRegistrationSzdjg3", [data.nickName, data.userId+"@tianyuan.com", '', "e5cdf6b8-abdc-11ef-b887-005056b86db5", '', "", 1, data.userId,'',data.userId], function (res) {
+                U.A.Request(US.Config.pbl + "batchRegistrationSzdjg3", [data.nickName, data.userId+"@tianyuan.com", 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc', data.orgName ? data.orgName : "e5cdf6b8-abdc-11ef-b887-005056b86db5", '', "", 1, data.userId,'',data.userId], function (res) {
                     // console.log(res);
                     let loginData = JSON.stringify({
                         openid: data.userId,
@@ -675,7 +675,9 @@ U.MD.D.getuser2 = function (userid, cid) {
         .then(result => {
             let a = JSON.parse(result)
             if(a.length>0){
-                $(".U_PBL_Check2")[0].style.display = "none";
+                if($(".U_PBL_Check2")[0]){
+                    $(".U_PBL_Check2")[0].style.display = "none";
+                }
                 let userId = a[0][0].userid
                 US.userInfo.userid = userId
                 U.A.Request(US.Config.pbl + "selectUser?userid=" + userid, [], function (res) { //US.userInfo.userid
@@ -1024,11 +1026,6 @@ function loginPan(userInfo, userId) {
   ) {
     $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")';
     US.Config.background = 'url("/img/icon/010606.png")';
-  } else if (
-    userInfo.organizeid == "e5cdf6b8-abdc-11ef-b887-005056b86db5"
-  ) {
-    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/Tianyuan.png")';
-    US.Config.background = 'url("/img/icon/Tianyuan.png")';
   }
 
   if (userInfo.org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
@@ -1085,6 +1082,11 @@ function loginPan(userInfo, userId) {
     $("#U_MD_D_BG")[0].style.backgroundImage =
       'url("/img/icon/SPROUTLabBg.png")';
     US.Config.background = 'url("/img/icon/SPROUTLabBg.png")';
+  } else if (
+    userInfo.org == "b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc"
+  ) {
+    $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/Tianyuan.png")';
+    US.Config.background = 'url("/img/icon/Tianyuan.png")';
   }
 
   US.userInfo = userInfo;
@@ -1113,7 +1115,9 @@ function loginSet(userInfo, res){
     } else {
         loginPan(userInfo, userId)
     }
-    $(".U_PBL_Check2")[0].style.display = "none";
+    if($(".U_PBL_Check2")[0]){
+        $(".U_PBL_Check2")[0].style.display = "none";
+    }
     $(".login")[0].style.display = "none";
     $(".register")[0].style.display = "none";
     $(".userName")[0].style.display = "block";