浏览代码

Merge branch 'beta'

lsc 2 月之前
父节点
当前提交
86b8439e67
共有 3 个文件被更改,包括 147 次插入1 次删除
  1. 1 0
      js/Desktop/DeskTop.js
  2. 138 0
      kityminder-editor/package-lock.json
  3. 8 1
      scanner/ocr.htm

+ 1 - 0
js/Desktop/DeskTop.js

@@ -637,6 +637,7 @@ U.MD.D.I.siesStudentDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.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)" } },
 ];
 
 //中山小学教师桌面图标的全局变量

文件差异内容过多而无法显示
+ 138 - 0
kityminder-editor/package-lock.json


+ 8 - 1
scanner/ocr.htm

@@ -5,6 +5,12 @@
 <head>
     <title>跨浏览器调用高拍仪测试demo</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+        body,
+        html {
+            overflow: hidden;
+        }
+    </style>
 </head>
 
 <!-- 引入高拍仪JS接口-->
@@ -12,7 +18,7 @@
 
 <script type="text/javascript">
 
-
+    document.domain = "cocorobo.cn"
     //时间格式化显示
     function formatDate(time) {
         var date = new Date(time);
@@ -238,6 +244,7 @@
 
 
     window.onload = function () {
+        document.domain = "cocorobo.cn"
         console.log("window.onload");
     }
 

部分文件因为文件数量过多而无法显示