Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -661,6 +661,7 @@ U.MD.D.I.guzmsteacherDeskIcon = [
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
     { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 //中山小学学生桌面图标的全局变量
@@ -781,6 +782,7 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
     { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
     { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 //hk
@@ -7693,9 +7695,9 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 "id": "cocoflowDeskTop",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { },
-                "isdrag": false,
             }, {
-                closecallback: function () { }
+                closecallback: function () { },
+                "isdrag": false,
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = ''
 
@@ -7707,17 +7709,32 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 "id": "liyuanLogin",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { },
+            }, {
+                closecallback: function () { },
                 isdrag: false,
                 isstretching: false,
                 isenlarge: false,
                 isnarrow: false
-            }, {
-                closecallback: function () { }
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = ''
 
             break;
-            
+        case "updatePaDialog":
+            _formdiv = new U.UF.UI.form(
+                "密码修改",
+                $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://invitelogin.cocorobo.cn/#/changePswd?userid=" + _userid }), {
+                "id": "updatePaDialog",
+                "style": { "width": "450px", "height": "610px", "overflow": 'hidden' },
+                "onresize": function () { },
+            }, {
+                closecallback: function () { },
+                isclose: false,
+                isdrag: false,
+                isstretching: false,
+                isenlarge: false,
+                isnarrow: false
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            break;
     }
     
 
@@ -7761,26 +7778,28 @@ U.MD.D.I.openApplicationWai = function (id, url, dom, array) {
             .filter(param => paramsMap[param] !== undefined)
             .map(param => `${param}=${paramsMap[param]}`);
 
-        queryString = canshu.length ? '?' + canshu.join('&') : ''; // 生成查询字符串
+        queryString = canshu.length ? (url.includes('?') ? '&' : '?') + canshu.join('&') : ''; // 生成查询字符串
     }
+
+    let _url = url + queryString
     if(U.UF.UI.form.allForm[id]){
         iframeBool = false
     }
     _formdiv = new U.UF.UI.form(
         false,
-        $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": url+queryString }), 
+        $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": _url }), 
         {
             "id": id,
             "style": { "width": "100%", "height": "100%", "overflow": 'hidden',"position": 'unset',"boxShadow": "unset" },
             "onresize": function () { },
+        }, 
+        {
+            closecallback: function () { },
             isdrag: false,
             isstretching: false,
             isenlarge: false,
             isnarrow: false
         }, 
-        {
-            closecallback: function () { }
-        }, 
         { "style": { "height": "36px" } },
         undefined,
         undefined,