Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1660,6 +1660,7 @@ U.MD.D.I.SPROUTLabTeacherDeskIcon = [
     { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 //SPROUT Lab
@@ -2181,7 +2182,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
         _easyDesktopIconInfo.push({ "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)", "width": '114px', 'height': '114px' } })
     }
-    if (_oid == '45facc0a-1211-11ec-80ad-005056b86db5' || _org == '0fec3a8a-ad04-11ed-b13d-005056b86db5') {
+    if (_oid == '45facc0a-1211-11ec-80ad-005056b86db5' || _org == '0fec3a8a-ad04-11ed-b13d-005056b86db5' || _org == '4d3812ef-fa66-11ef-b508-005056924926') {
         _teacherDesktopIconInfo.push(
             // { "Name": "chatPDF", "Url": "chatPDF", "style": { "cssText": "background-image:url(/img/icon/chatPDF.png)" } },
             { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
@@ -7455,10 +7456,13 @@ U.MD.D.I.openApplication = function (str, obj, info) {
     }
     // if(iframeBool){
     //     U.UF.DL.loading($("iframe", _formdiv)[0].parentElement.parentElement)
-    //     let onloadListener = $("iframe", _formdiv)[0].onload = () => {
-    //         console.log("iframe进入");
+    //     // let onloadListener = $("iframe", _formdiv)[0].onload = () => {
+    //     //     console.log("iframe进入");
+    //     //     U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
+    //     // };
+    //     setTimeout(() => {
     //         U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
-    //     };
+    //     }, 2000);
     // }
 }