Commit Graph

1032 Commits

Author SHA1 Message Date
670788339
ee8a76c4df 作业提交按钮判断 2025-07-09 13:48:31 +08:00
sunhonglai
505e3ce00c 修改进度条文案 2025-04-21 14:37:53 +08:00
joshen
b6a3a32412 Merge remote-tracking branch 'aliyun/master_20250319-lyc' 2025-04-02 16:59:49 +08:00
sunhonglai
d6fd44830b 去掉无用日志 2025-04-01 08:30:37 +08:00
sunhonglai
d01fd6f07b 修改视频播放拖拽问题 2025-03-31 19:13:55 +08:00
670788339
f9e332ab7c SZX-1045 2025-03-28 11:47:43 +08:00
joshen
49137387f6 Merge branch '250220-pre-126-177-gx' into master_1202 2025-03-13 17:16:32 +08:00
gengxin
812c09d65c 考试完成判断 2025-03-13 16:38:33 +08:00
gengxin
57a87db016 考试状态修改 2025-03-13 16:32:02 +08:00
gengxin
2536fca503 考试及格线 2025-03-13 16:22:07 +08:00
joshen
047b1f9bae Merge branch '250220-pre-126-177-gx' into master_1202 2025-03-12 17:33:00 +08:00
gengxin
7162d329ee 考试及格线 2025-03-12 17:00:25 +08:00
gengxin
d7d80e8244 考试及格线获取 2025-03-12 16:27:44 +08:00
joshen
713f258c14 Merge branch '250220-pre-126-177-gx' into master_1202
# Conflicts:
#	src/views/portal/case/Index.vue
#	src/views/study/Courses.vue
2025-03-11 17:12:30 +08:00
gengxin
def3892edc 退出全屏 ,需要水印12 2025-03-11 11:51:51 +08:00
gengxin
51a8da4bdb 退出全屏 ,需要水印11 2025-03-11 11:45:34 +08:00
gengxin
6536e36857 退出全屏 ,需要水印10 2025-03-11 11:29:14 +08:00
gengxin
1bf9398177 退出全屏 ,需要水印9 2025-03-11 11:26:11 +08:00
gengxin
a5333952c9 退出全屏 ,需要水印8 2025-03-11 11:15:18 +08:00
gengxin
127f191776 退出全屏 ,需要水印7 2025-03-11 11:09:19 +08:00
gengxin
e9b9a14b69 退出全屏 ,需要水印6 2025-03-11 11:04:53 +08:00
gengxin
11a1065df9 退出全屏 ,需要水印5 2025-03-11 11:00:45 +08:00
gengxin
001452fa2e 退出全屏 ,需要水印4 2025-03-11 10:52:46 +08:00
gengxin
988a7a1e17 退出全屏 ,需要水印3 2025-03-11 10:43:00 +08:00
gengxin
7fed1a3991 退出全屏 ,需要水印3 2025-03-11 10:41:44 +08:00
gengxin
5448a9724d 退出全屏 ,需要水印2 2025-03-11 10:24:53 +08:00
gengxin
23928a0865 退出全屏 ,需要水印1 2025-03-11 10:01:54 +08:00
joshen
04ecf6a971 退出全屏 esc 触发监听2 2025-03-10 14:08:08 +08:00
joshen
5381416a05 退出全屏 esc 触发监听 2025-03-10 11:46:02 +08:00
joshen
216141dbd3 退出全屏 esc 触发监听 2025-03-10 11:30:53 +08:00
joshen
1dad88c59b 退出全屏 2025-03-10 11:18:16 +08:00
gengxin
e74f14baa0 弹出框处理 2 2025-03-05 08:03:00 +08:00
gengxin
aa0fcf6ff0 弹出框处理 2025-03-05 07:55:39 +08:00
joshen
d33e27b3d0 Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into master_1202 2025-02-27 21:07:42 +08:00
Pengxiansen
3d3f2ebc6e 提交 2025-02-27 21:02:06 +08:00
Pengxiansen
d027a4c56a 提交 2025-02-27 13:45:29 +08:00
Pengxiansen
c6b2c46311 提交 2025-02-27 09:20:42 +08:00
joshen
609902aeb8 Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220 2025-02-26 21:45:32 +08:00
Pengxiansen
6399aa3352 提交 2025-02-26 21:42:14 +08:00
joshen
a78f6a0152 Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into test20250220 2025-02-20 19:17:59 +08:00
Pengxiansen
1927b5b67f 提交 2025-02-13 17:36:21 +08:00
joshen
5e7580a936 判空 2025-01-18 00:23:45 +08:00
zhangsir
00d272c3d0 数据导致的报错 2025-01-10 14:29:54 +08:00
joshen
b9ec8ed534 Merge branch 'master_1202' into master-video-0930
# Conflicts:
#	src/components/VideoPlayer/index.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue
2025-01-08 18:38:07 +08:00
joshen
67f2ff3e86 重新提交 2024-12-12 11:56:35 +08:00
joshen
3588ef3e67 回退 2024-12-12 11:42:11 +08:00
joshen
cc0362380e Merge branch 'zcwy_0822_case' into master_1202 2024-12-12 10:56:07 +08:00
zhangsir
45027ca77e 2024 2024-12-10 19:53:38 +08:00
joshen
f98fda4f78 Merge remote-tracking branch 'yx/zcwy_1127_teacher' into master_1202 2024-12-02 19:21:14 +08:00
zhangsir
1ad2c80c9b 添加教师修改接口 2024-12-02 17:43:50 +08:00