Merge commit 'master' into beta

js/Desktop/DeskTop.js

@@ -6275,7 +6275,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "课堂观察",
-                    $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://beta.cloud.cocorobo.cn/aigpt/#/classroom_observation_board?tid=" + data }), {
+                    $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cloud.cocorobo.cn/aigpt/#/classroom_observation_board?tid=" + data }), {
                     "id": "classroom_observation_board",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                     "onresize": function () { }
@@ -6292,7 +6292,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "课堂审核",
-                    $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://beta.cloud.cocorobo.cn/aigpt/#/classroom_observation_ob_comment?tid=" + data }), {
+                    $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cloud.cocorobo.cn/aigpt/#/classroom_observation_ob_comment?tid=" + data }), {
                     "id": "classroom_observation_ob_comment",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                     "onresize": function () { }
@@ -7996,7 +7996,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "aigpt": //gpt4
             _formdiv = new U.UF.UI.form(
                 "AI助手+",
-                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://beta.cloud.cocorobo.cn/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cloud.cocorobo.cn/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "aigpt",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                 "onresize": function () { }
@@ -8322,7 +8322,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             U.MD.D.addOp('', 'cocoflowOpen', '')
             _formdiv = new U.UF.UI.form(
                 "CocoFlow",
-                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//beta.app.cocorobo.cn/#/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//app.cocorobo.cn/#/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "appStore",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                 "onresize": function () { }

js/Desktop/Onload.js

@@ -59,8 +59,8 @@ US.Config = {
     edu: '//api.edu.cocorobo.cn/edu/',
     origin: '//cocorobo.cn',
     pbl: "//pbl.cocorobo.cn/api/pbl/",
-    // bpbl:"//pbl.cocorobo.cn",//正式链接
-    bpbl:"//beta.pbl.cocorobo.cn",//测试链接
+    bpbl:"//pbl.cocorobo.cn",//正式链接
+    // bpbl:"//beta.pbl.cocorobo.cn",//测试链接
     // pbl: "http://localhost:7003/api/pbl/",
     basename: '',
     type:1,
@@ -781,7 +781,6 @@ U.MD.D.getuser2 = function (userid, cid) {
                         U.MD.D.I.openApplication("studentStudy")
                     }
                     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
-
                     if(cid){
                         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
                         U.MD.D.addOp3("1", "", { type: "user_login_inviteCode" }, "success")

js/app/Onload.js

@@ -52,8 +52,8 @@ US.Config = {
     edu: '//api.edu.cocorobo.cn/edu/',
     origin: '//cocorobo.cn',
     pbl: "//pbl.cocorobo.cn/api/pbl/",
-    // bpbl:"//pbl.cocorobo.cn",//正式链接
-    bpbl:"//beta.pbl.cocorobo.cn",//测试链接
+    bpbl:"//pbl.cocorobo.cn",//正式链接
+    // bpbl:"//beta.pbl.cocorobo.cn",//测试链接
     // pbl: "http://localhost:7003/api/pbl/",
     basename: '',
     type:1,

js/liyuan/Onload2.js

@@ -67,8 +67,8 @@ US.Config = {
     edu: '//api.edu.cocorobo.cn/edu/',
     origin: '//cocorobo.cn',
     pbl: "//pbl.cocorobo.cn/api/pbl/",
-    // bpbl:"//pbl.cocorobo.cn",//正式链接
-    bpbl:"//beta.pbl.cocorobo.cn",//测试链接
+    bpbl:"//pbl.cocorobo.cn",//正式链接
+    // bpbl:"//beta.pbl.cocorobo.cn",//测试链接
     // pbl: "http://localhost:7003/api/pbl/",
     basename: '',
     type:1,