Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -1149,12 +1149,21 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
 
     }
 
+    //麒麟二中 和 民新小学
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5' || _oid == "d67940a5-510c-40ea-9c9a-2631ab03013a") {
         _teacherDesktopIconInfo.push(
             { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
         )   
     }
 
+    //麒麟二中
+    if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5') {
+        _studentDesktopIconInfo.push(
+            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+        )
+    }
+
+    //万科双语
     if (_oid == '1c3b9def-8fbe-11ed-b13d-005056b86db5') {
         _studentDesktopIconInfo3 = _studentDesktopIconInfo3.filter((el) => {
             if (el.Name == '項目管理') {
@@ -1162,7 +1171,9 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             }
             return el
         })
-
+        _studentDesktopIconInfo3.push(
+            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+        )
     }
 
     if (_oid != '45facc0a-1211-11ec-80ad-005056b86db5') {

js/Desktop/Onload.js

@@ -433,8 +433,8 @@ U.MD.D.getuser = function () {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
                                         US.Config.background = 'url("/img/icon/dseiBg.png")'
                                     } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
-                                        US.Config.background = 'url("/img/icon/szjkyBg.png")'
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+                                        US.Config.background = 'url("/img/icon/szjkyBg2.png")'
                                     } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
                                         US.Config.background = 'url("/img/icon/chjyjBg.png")'
@@ -551,7 +551,7 @@ U.MD.D.getuser = function () {
             } 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/szjkyBg.png")'
+                $("#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")'
             }
@@ -659,8 +659,8 @@ U.MD.D.getuser2 = function (userid, cid) {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
             US.Config.background = 'url("/img/icon/dseiBg.png")'
         } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
-            US.Config.background = 'url("/img/icon/szjkyBg.png")'
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+            US.Config.background = 'url("/img/icon/szjkyBg2.png")'
         } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             US.Config.background = 'url("/img/icon/chjyjBg.png")'

node/message.js

@@ -2306,7 +2306,7 @@ us.getcscldata = function (response, calssid, pageid, userid) {
         //如果不存在则去数据库查找
         us.mysql.usselect(['172.16.12.5', 'pbl', 'select_room', calssid],
             function (ret) {
-                var _user = us.getuserbytype(us.cscl[calssid].user);
+                var _user = [];
                 if (ret) {
                     ret[0][0].user = _user; //这里是项目当前所有用户
                     response.end(JSON.stringify(ret)); //返回文档内容