Commit Graph

568 Commits

Author SHA1 Message Date
zdg d033c217d6 数据共享配置 渲染器和主进程 2024-08-26 11:47:10 +08:00
lyc b922219602 Merge pull request 'lyc-dev' (#153) from lyc-dev into main 2024-08-23 11:22:52 +08:00
lyc 386c4e09c6 冲突 2024-08-23 11:21:57 +08:00
zhengdegang b738ade9a4 Merge pull request 'zdg' (#152) from zdg into main
Reviewed-on: #152
2024-08-23 10:45:00 +08:00
zdg 6f6d56b37b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-23 10:43:57 +08:00
zdg c1f81a8e5c 更新 点赞,疑惑 2024-08-23 10:43:44 +08:00
lyc d003ecf8ce Merge branch 'main' into lyc-dev 2024-08-23 09:56:28 +08:00
lyc 146784bf26 增加一个预览文件 2024-08-23 09:56:14 +08:00
yangws 88e63f376c Merge pull request 'add:新增第三方对接素材;' (#151) from yangws into main
Reviewed-on: #151
2024-08-23 09:45:04 +08:00
yangws 99ee438fd7 add:新增第三方对接素材; 2024-08-23 09:44:03 +08:00
lyc 2279bbb904 布置作业修改 2024-08-22 10:43:05 +08:00
lyc b0d969546a Merge branch 'main' into lyc-dev 2024-08-22 09:43:10 +08:00
lyc 8ec96996c6 增加预览pdf 2024-08-22 09:42:55 +08:00
zhengdegang 968b5d3e43 Merge pull request 'zdg' (#150) from zdg into main
Reviewed-on: #150
2024-08-22 09:29:49 +08:00
zdg c0fd0ae9d3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-22 09:28:17 +08:00
zdg 86cd50b8a3 im-点赞 疑惑 作业布置 2024-08-22 09:14:21 +08:00
zhengdegang 9240c055f4 Merge pull request 'zdg' (#149) from zdg into main
Reviewed-on: #149
2024-08-21 09:21:06 +08:00
zdg 6d77d54bc1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-21 09:18:15 +08:00
zdg c57f21461a 点赞动画优化 2024-08-21 09:18:00 +08:00
lyc d669b6ee42 Merge pull request '教材选择不区分上下册' (#148) from lyc-dev into main 2024-08-20 17:11:00 +08:00
lyc 13598615c7 教材选择不区分上下册 2024-08-20 14:24:18 +08:00
zdg a80a3b006c Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-20 14:21:29 +08:00
zdg a2e72b855b 优化 2024-08-20 14:21:25 +08:00
zhangxuelin 1e0ff00503 1 2024-08-20 10:22:42 +08:00
zhangxuelin d30b4a230a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-20 10:22:05 +08:00
zhangxuelin b8ea091bb5 最小化pdf 2024-08-20 10:22:02 +08:00
zdg 04a03b0c43 配置到公共环境,所有环境都使用 2024-08-20 09:54:24 +08:00
zdg f7ad8d4c71 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-19 17:15:09 +08:00
朱浩 f98fa5a3f3 二期:打包IM 2024-08-19 16:30:57 +08:00
zdg 6fb7369ce5 配置im 打包 2024-08-19 14:37:18 +08:00
zdg 49c4c7245a 打包chat-im 2024-08-19 14:21:42 +08:00
zhengdegang 4fd47d2f2f Merge pull request 'zdg' (#147) from zdg into main
Reviewed-on: #147
2024-08-16 17:35:43 +08:00
zhangxuelin 44bec9fab4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 17:33:41 +08:00
zhangxuelin 56483a9a49 shareStore状态优化 2024-08-16 17:33:27 +08:00
zhengdegang 4f6c7f157c Merge pull request 'zdg' (#146) from zdg into main
Reviewed-on: #146
2024-08-16 17:08:11 +08:00
zdg 631fcf38f7 恢复 2024-08-16 17:07:06 +08:00
zdg cf477398c9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 16:43:06 +08:00
zdg e3e704d95d 修复 2024-08-16 16:41:05 +08:00
yangws f8eece2ff6 Merge pull request 'fix:课件改为线上的;' (#145) from yangws into main
Reviewed-on: #145
2024-08-16 14:34:40 +08:00
yangws 7fc7135d73 fix:课件改为线上的; 2024-08-16 14:33:46 +08:00
zhengdegang 6bc2579c2e Merge pull request 'zdg' (#144) from zdg into main
Reviewed-on: #144
2024-08-16 13:42:39 +08:00
zdg 75caf13d8b im-chat 2024-08-16 13:41:33 +08:00
zdg 7fb98309fb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 10:15:31 +08:00
zdg a3b7248977 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 10:15:17 +08:00
zdg 6ae7c2c4b7 优化im 2024-08-16 10:15:12 +08:00
朱浩 c19631eb89 Merge pull request '二期:保存用户不成功的问题' (#143) from zhuhao_dev into main
Reviewed-on: #143
2024-08-16 09:11:50 +08:00
朱浩 b8896bf53d 二期:保存用户不成功的问题 2024-08-16 09:11:10 +08:00
朱浩 6f5eee4289 Merge pull request 'zhuhao_dev' (#142) from zhuhao_dev into main
Reviewed-on: #142
2024-08-16 09:07:02 +08:00
朱浩 aec8e9a21f Merge remote-tracking branch 'origin/main' 2024-08-16 09:05:13 +08:00
朱浩 de909adccb 二期:修复图片加载失败无法点击的问题 2024-08-15 16:23:07 +08:00