Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1711,6 +1711,7 @@ U.MD.D.I.x010504TeacherDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "智能表单", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 //010504
@@ -7454,15 +7455,9 @@ U.MD.D.I.openApplication = function (str, obj, info) {
     }
     // if(iframeBool){
     //     U.UF.DL.loading($("iframe", _formdiv)[0].parentElement.parentElement)
-    //     let onload = U.UF.DL.iframeLoad($("iframe", _formdiv)[0], function () {
-    //         U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
-    //     })
     //     let onloadListener = $("iframe", _formdiv)[0].onload = () => {
     //         U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
     //     };
-    //     if(!(onload || onloadListener)){
-    //         U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
-    //     }
     // }
 }