zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity
1,373 Commits 9 Branches 26 Tags 40 MiB
Commit Graph

1373 Commits

Author SHA1 Message Date
朱浩 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
yangws f7b00b1ccd Merge pull request 'fix:个人信息宽度调整;' (#141) from yangws into main 
Reviewed-on: #141
 2024-08-15 15:59:41 +08:00
yangws c94563fd43 fix:个人信息宽度调整; 2024-08-15 15:58:58 +08:00
lyc c1a34c61c9 Merge pull request 'lyc-dev' (#140) from lyc-dev into main 2024-08-15 15:16:07 +08:00
lyc a68b2a2805 Merge branch 'main' into lyc-dev 2024-08-15 15:15:40 +08:00
lyc 0d1a96b202 窗口minwidth 2024-08-15 15:15:22 +08:00
yangws 71fe8a0a8f Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显;' (#139) from yangws into main 
Reviewed-on: #139
 2024-08-15 15:11:43 +08:00
yangws b8f95eb20f fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显; 2024-08-15 15:10:42 +08:00
lyc 5328607ce1 Merge pull request '禁用双击最大化' (#138) from lyc-dev into main 2024-08-15 14:57:29 +08:00
lyc a17be49850 禁用双击最大化 2024-08-15 14:57:08 +08:00
yangws 2a4dac58ac Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显;' (#137) from yangws into main 
Reviewed-on: #137
 2024-08-15 14:11:32 +08:00
yangws 0fe264054c fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显; 2024-08-15 14:10:29 +08:00
lyc f632bab6b3 Merge pull request 'lyc-dev' (#136) from lyc-dev into main 2024-08-15 13:58:17 +08:00
lyc ae52510c7c Merge branch 'main' into lyc-dev 2024-08-15 13:57:36 +08:00
lyc 86d5f33119 登录 修改 2024-08-15 13:57:23 +08:00
zhangxuelin 2ed62802ce Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-15 11:21:48 +08:00
zhangxuelin 2ee5e24e6f 课程预约显示 bug修改 2024-08-15 11:18:33 +08:00
lyc cf3129ed66 Merge pull request 'lyc-dev' (#135) from lyc-dev into main 2024-08-15 10:32:15 +08:00
lyc 97e035398c Merge branch 'main' into lyc-dev 2024-08-15 10:31:34 +08:00
lyc 6e8c96ce2e 布置作业默认日期修改 2024-08-15 10:31:11 +08:00
zhangxuelin 3448a029c6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-15 10:25:29 +08:00
lyc decfb09eb4 Merge pull request 'lyc-dev' (#134) from lyc-dev into main 
Reviewed-on: #134
 2024-08-15 09:59:07 +08:00
zhangxuelin 1dce3f6f70 窗口修改 2024-08-15 09:57:46 +08:00
lyc 2a84455f05 教材封面baseUrl 2024-08-15 09:55:37 +08:00
zhangxuelin d9ae544022 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/renderer/src/utils/tool.js
 2024-08-14 17:50:16 +08:00
zhangxuelin b520858f3f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/renderer/src/utils/tool.js
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/components/side.vue
 2024-08-14 17:48:32 +08:00
zdg 758a4b09c9 提交 2024-08-14 17:47:42 +08:00
lyc ba9b381b69 Merge branch 'main' into lyc-dev 2024-08-14 17:27:34 +08:00
zdg 716c16928e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-14 17:23:39 +08:00
zdg 0da2b25586 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/renderer/src/utils/tool.js
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/components/side.vue
#	src/renderer/src/views/tool/sphere.vue
 2024-08-14 17:23:32 +08:00
朱浩 6616ac640e Merge pull request 'zhuhao_dev' (#133) from zhuhao_dev into main 
Reviewed-on: #133
 2024-08-14 17:22:19 +08:00
朱浩 f3619817f9 Merge branch 'main' into zhuhao_dev 2024-08-14 17:21:38 +08:00
zdg bb1d5da104 保存-群id 2024-08-14 16:53:40 +08:00
zdg 69f54a217b Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/main/index.js
#	src/renderer/src/views/tool/sphere.vue
 2024-08-14 16:42:59 +08:00
lyc 4754ed641c 上课-作业 修改 2024-08-14 16:40:43 +08:00
yangws c64fbe49e9 Merge pull request 'fix:上传存图片路径;' (#132) from yangws into main 
Reviewed-on: #132
 2024-08-14 16:32:23 +08:00
yangws 3c2dbb722a fix:上传存图片路径; 2024-08-14 16:31:30 +08:00
zdg 1c67ce1b8f im通信 2024-08-14 16:31:08 +08:00
yangws acbd36ca88 Merge pull request 'yangws' (#131) from yangws into main 
Reviewed-on: #131
 2024-08-14 15:58:42 +08:00
yangws 1e52abc170 fix:新加个人中心修改学段; 2024-08-14 15:58:06 +08:00
yangws 1a1f20d175 Merge remote-tracking branch 'origin/main' into yangws 2024-08-14 15:57:20 +08:00
朱浩 1aded1d50a 二期：修复中文目录无法打开文件的问题 2024-08-14 15:45:27 +08:00
lyc 94ae78bffc Merge branch 'main' into lyc-dev 2024-08-14 14:57:17 +08:00
lyc c72d103082 查询作业修改 2024-08-14 14:57:00 +08:00
lyc 22f35a6638 Merge pull request 'lyc-dev' (#130) from lyc-dev into main 2024-08-14 14:08:52 +08:00
lyc bf783cf940 作业 2024-08-14 14:07:53 +08:00
lyc b255e48be5 冲突 2024-08-14 14:06:02 +08:00
lyc 41b0660559 打开外部链接 url 增加参数 2024-08-14 14:03:06 +08:00