hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-23 01:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,910 Commits 87 Branches 0 Tags
53e162edee6228dff2a07bca1a7a2a70c741611a
Commit Graph

1022 Commits

Author SHA1 Message Date
joshen
53e162edee Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-11 10:53:09 +08:00
gengxin
001452fa2e 退出全屏 ，需要水印4 2025-03-11 10:52:46 +08:00
joshen
23ab0ab0ec Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-11 10:48:41 +08:00
gengxin
988a7a1e17 退出全屏 ，需要水印3 2025-03-11 10:43:00 +08:00
gengxin
7fed1a3991 退出全屏 ，需要水印3 2025-03-11 10:41:44 +08:00
joshen
6b58b61151 Merge branch '250220-pre-126-177-gx' into test20250220 
# Conflicts:
#	src/components/VideoPlayer/index.vue
 2025-03-11 10:25:59 +08:00
gengxin
5448a9724d 退出全屏 ，需要水印2 2025-03-11 10:24:53 +08:00
joshen
c6799dba63 Merge branch '250220-pre-126-177-gx' into test20250220 
# Conflicts:
#	src/components/VideoPlayer/index.vue
 2025-03-11 10:06:37 +08:00
gengxin
23928a0865 退出全屏 ，需要水印1 2025-03-11 10:01:54 +08:00
joshen
53aa40cee3 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-10 14:17:46 +08:00
joshen
04ecf6a971 退出全屏 esc 触发监听2 2025-03-10 14:08:08 +08:00
joshen
0f1c8081cb 退出全屏 esc 触发监听1 2025-03-10 13:17:13 +08:00
joshen
01a1b2c7a9 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-10 11:46:28 +08:00
joshen
5381416a05 退出全屏 esc 触发监听 2025-03-10 11:46:02 +08:00
joshen
573370c019 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-10 11:31:17 +08:00
joshen
216141dbd3 退出全屏 esc 触发监听 2025-03-10 11:30:53 +08:00
joshen
a66e09630a Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-10 11:18:42 +08:00
joshen
1dad88c59b 退出全屏 2025-03-10 11:18:16 +08:00
joshen
e6fa45a5ac 测试一下6 2025-03-06 20:58:28 +08:00
joshen
0d904de3ed 测试一下5 2025-03-06 20:27:34 +08:00
joshen
0119b4a86c Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-05 08:03:53 +08:00
gengxin
e74f14baa0 弹出框处理 2 2025-03-05 08:03:00 +08:00
joshen
30b497805b Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-05 07:57:01 +08:00
gengxin
aa0fcf6ff0 弹出框处理 2025-03-05 07:55:39 +08:00
joshen
f47a3ea342 Merge remote-tracking branch 'aliyun/250220-pre-126-177-gx' into test20250220 
# Conflicts:
#	src/views/portal/case/Index.vue
#	src/views/study/Courses.vue
 2025-03-04 23:02:04 +08:00
joshen
d0b731158e Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220 2025-02-27 09:32:49 +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
zhangsir
21afc82036 添加教师修改接口 2024-11-27 18:11:49 +08:00
joshen
3e137990b7 Merge branch 'zcwy_0822_case' into dev_master 2024-11-26 20:48:58 +08:00
zhangsir
602a49e292 视频禁止拖动修改 2024-11-26 17:43:07 +08:00
zhangsir
2576fdd070 授课教师名称增加工号 2024-11-04 16:26:43 +08:00
joshen
61cdd7c821 Merge branch 'master-video-0930' into 'master' 
pc播放器拖动修改

See merge request !124
 2024-10-16 19:58:18 +08:00
joshen
90ca7e4750 pc播放器拖动修改 2024-10-16 19:53:35 +08:00
nisen
e44279c92f Merge branch 'master_1008' into dev_master 2024-10-15 18:14:56 +08:00
joshen
6b6e8a4096 pc视频播放器禁止拖动 2024-10-10 23:07:46 +08:00
joshen
590da41c59 PC视频播放器添加禁止拖动视频 2024-10-10 23:00:16 +08:00
nisen
cbedc3f880 Merge branch 'zcwy_0806_paihangb' into master_1008 2024-10-10 16:53:12 +08:00