Commit Graph
936 Commits
Author SHA1 Message Date
田岩 ea3af81707 1 2025-11-05 13:16:13 +08:00
田岩 b9aad97873 关闭登录的时候请求积分 2025-11-05 10:54:12 +08:00
田岩 7f385f7cdb Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-11-04 17:48:51 +08:00
田岩 a10b8c5831 上传上架信息 2025-11-04 17:48:22 +08:00
杨航 466516ea16 feat: 陪练选择角色 2025-11-04 14:08:08 +08:00
田岩 7ae9419971 开发进度中断 2025-11-04 14:03:31 +08:00
田岩 a35d0af64a 暂存 2025-11-04 09:35:41 +08:00
杨航 68af8c9da6 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-11-03 17:40:51 +08:00
杨航 cec5a746d3 feat: 陪练详情展示页面联调 2025-11-03 17:40:48 +08:00
田岩 df1004edca Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-10-31 14:09:36 +08:00
田岩 1a3a7d8ab1 提交签到 2025-10-31 14:09:07 +08:00
杨航 9c72b4dc9b Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-10-30 17:31:26 +08:00
杨航 38b429e52b feat: 陪练页面样式 2025-10-30 17:31:24 +08:00
田岩 e6e4224848 合并 DEV-20251115 到 develop,解决冲突2 2025-10-30 14:41:20 +08:00
田岩 35f8a3f00c 修改me页一个文字 2025-10-30 14:35:28 +08:00
田岩 1f7cd049f9 合并 DEV-20251115 到 develop,解决冲突 2025-10-30 14:13:38 +08:00
杨航 f00bfcd21a feat: ai陪练样式 2025-10-30 14:09:55 +08:00
田岩 9f4b0362bc 兼容性问题修改完毕 2025-10-29 20:00:56 +08:00
杨航 0c553b0b26 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-10-29 15:09:54 +08:00
杨航 de47ba6a54 fix: 样式处理 2025-10-29 15:09:51 +08:00
田岩 aef700f11f Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-10-29 15:09:24 +08:00
田岩 0c0237bb2d 修改登录 2025-10-29 15:08:41 +08:00
杨航 0aa2d9efc2 fix:样式调整 2025-10-29 14:40:23 +08:00
杨航 77ccc9f237 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-10-29 14:37:48 +08:00
杨航 1d826e9932 fix: ai学习页面调整 2025-10-29 14:37:45 +08:00
田岩 1e9cc30c1b 三阶段签到页面 2025-10-29 14:14:00 +08:00
田岩 7107dade1a 三期pk功能开发以及积分两个页 2025-10-24 14:53:19 +08:00
杨航 7bffe0c9d7 fix: 调整演示文件 2025-10-17 08:56:57 +08:00
杨航 b72521532b fix; 修改ip 2025-10-11 10:30:18 +08:00
杨航 6c1311c8bc fix: bug 2025-10-09 10:11:07 +08:00
刘宏浩 fe3a90e9c5 Merge branch 'sit' into 'master'
Sit

See merge request K17_AITS/tra-app!208
2025-09-30 10:25:29 +08:00
田岩 2f5e443fc1 Merge branch 'develop' into 'sit'
Develop

See merge request K17_AITS/tra-app!206
2025-09-28 17:40:01 +08:00
杨航 720ca45fa1 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-28 16:30:50 +08:00
杨航 4a8fe66888 fix; 图片显示问题处理 2025-09-28 16:30:46 +08:00
田岩 170d57c258 Merge branch 'develop' into 'sit'
Develop

See merge request K17_AITS/tra-app!204
2025-09-28 10:48:07 +08:00
田岩 378f4e603e Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-28 10:37:01 +08:00
杨航 cd22895a12 fix: bug 2025-09-28 10:35:48 +08:00
田岩 1e6a0aea27 Merge branch 'master' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-28 10:35:43 +08:00
田岩 50cae94bf8 1 2025-09-28 10:35:37 +08:00
杨航 42b2165cc6 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-26 18:29:50 +08:00
杨航 a9f2016757 fix: 调整 2025-09-26 18:29:47 +08:00
田岩 0314cd3cd0 Merge branch 'develop' into 'sit'
Develop

See merge request K17_AITS/tra-app!202
2025-09-26 18:22:16 +08:00
田岩 424dded8f7 解决配置文件冲突 2025-09-26 18:10:43 +08:00
田岩 3aa40795a9 修复练习后的去考试按钮没判断考试是否设置 2025-09-26 18:10:00 +08:00
杨航 85f012f510 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-26 17:44:08 +08:00
杨航 fc9b0f455e fix: bug 2025-09-26 17:44:05 +08:00
田岩 e4c1511093 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-26 17:31:31 +08:00
田岩 180640f3c0 整理下代码 2025-09-26 17:31:23 +08:00
杨航 89cc278179 fix: bug 2025-09-26 16:48:29 +08:00
杨航 0ba0249369 Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop 2025-09-26 16:42:43 +08:00