Ver Fonte

Merge branch 'beta'

lsc há 2 dias atrás
pai
commit
9b01d2c388
3 ficheiros alterados com 5 adições e 2 exclusões
  1. 1 1
      app.html
  2. 2 0
      js/Desktop/DeskTop.js
  3. 2 1
      js/liyuan/Onload2.js

+ 1 - 1
app.html

@@ -17,6 +17,6 @@
     </style>
 </head>
 <body>
-    <iframe allow="camera *; microphone *;display-capture;midi;encrypted-media;fullscreen;" allowfullscreen src="https://beta.cloud.cocorobo.cn/admin.html" frameborder="0"></iframe>
+    <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;" allowfullscreen src="https://beta.cloud.cocorobo.cn/admin.html" frameborder="0"></iframe>
 </body>
 </html>

+ 2 - 0
js/Desktop/DeskTop.js

@@ -2178,7 +2178,9 @@ U.MD.D.I.MOAIStudentDeskIcon = [
 
 //PREPAI
 U.MD.D.I.PREPAITeacherDeskIcon = [
+    { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
     { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 

+ 2 - 1
js/liyuan/Onload2.js

@@ -774,12 +774,13 @@ U.MD.D.getuser2 = function (userid, cid) {
                         U.MD.D.I.openApplication("studentStudy")
                     }
                     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+                    U.UF.Cookie.set("cocoroboLoginType=2");
+                    LoginState = true
 
                     if(cid){
                         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
                         U.MD.D.addOp3("1", "", { type: "user_login_inviteCode" }, "success")
                     }
-                    // U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
                 });
             }