Commit Graph

2831 Commits

Author SHA1 Message Date
gengxin
a8d44d0169 播放加上水印 2025-03-10 14:46:03 +08:00
joshen
567bed812b 退出全屏 esc 触发监听4 2025-03-10 14:21:58 +08:00
joshen
2e0fe475f2 退出全屏 esc 触发监听3 2025-03-10 14:17:17 +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
joshen
0f3c53cb31 点击 exit 退出 执行效果 2025-03-10 11:11:58 +08:00
joshen
1f4416e9b1 水印的生效 2025-03-10 10:39:01 +08:00
joshen
2ffe9c1872 去除水印 2025-03-08 11:06:12 +08:00
gengxin
e74f14baa0 弹出框处理 2 2025-03-05 08:03:00 +08:00
gengxin
aa0fcf6ff0 弹出框处理 2025-03-05 07:55:39 +08:00
gengxin
9fba452d2d 弹出框处理 2025-03-05 07:46:22 +08:00
gengxin
5b5d73c905 云效地址更爱 2025-02-20 13:42:44 +08:00
zhangsir
00d272c3d0 数据导致的报错 2025-01-10 14:29:54 +08:00
zhangsir
398bbc675b 数据导致的报错 2025-01-10 09:49:25 +08:00
zhangsir
d0a6807d2c 数据导致的报错 2025-01-09 17:30:40 +08:00
joshen
f01283f530 10.251.132.75 2025-01-09 11:49:44 +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
5f9da5cf03 Merge branch 'zcwy_0822_case' into master_1202
# Conflicts:
#	src/views/hotforum/Index.vue
2024-12-27 16:15:16 +08:00
zhangsir
1b3064f2ab 替换图片 2024-12-27 16:11:01 +08:00
joshen
24be910b83 回退图片 2024-12-25 14:20:11 +08:00
joshen
6153daa98a Merge branch 'zcwy_0822_case' into master_1202
# Conflicts:
#	src/views/hotforum/Index.vue
2024-12-24 16:40:18 +08:00
zhangsir
c5f6f5c83e 替换图片 2024-12-24 16:22:37 +08:00
joshen
4d0cae9346 Merge branch 'zcwy_1127_teacher' into master_1202 2024-12-12 16:46:44 +08:00
zhangsir
5be181df8c 回退授课记录页面 2024-12-12 16:45:08 +08:00
joshen
67f2ff3e86 重新提交 2024-12-12 11:56:35 +08:00
joshen
3588ef3e67 回退 2024-12-12 11:42:11 +08:00
joshen
7fab8bb062 huancun 2024-12-12 11:12:54 +08:00
joshen
977af999a3 huancun 2024-12-12 11:10:03 +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
83838b2c1a Merge branch 'zcwy_1127_teacher' into master_1202 2024-12-10 18:15:33 +08:00
zhangsir
acbacac737 讲师管理授课记录讲师端 2024-12-10 14:32:51 +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
nisen
0397b4c310 Merge branch 'zcwy_0822_case' into dev_master 2024-11-18 20:17:16 +08:00
zhangsir
6bf278c148 讲师视频下一步展示问题 2024-11-14 17:35:26 +08:00
nisen
3080303fa3 Merge branch 'pingcode-1104' into dev_master 2024-11-07 17:28:03 +08:00
nisen
50dca2caa9 Merge branch 'zcwy_0822_case' into dev_master 2024-11-04 17:53:51 +08:00
zhangsir
2576fdd070 授课教师名称增加工号 2024-11-04 16:26:43 +08:00
zhangsir
548d891be3 一上来搜索的条数改为20 2024-11-04 15:28:38 +08:00
zhangsir
0dc3884d46 讲师认证修改参数改为keyword 2024-11-01 17:03:33 +08:00
nisen
633ddbd51c Merge branch 'zcwy_0822_case' into dev_master 2024-10-31 21:06:42 +08:00
zhangsir
22861dadf2 userNo修改参数 2024-10-30 17:57:56 +08:00
nisen
493ebfa05b Merge remote-tracking branch '104/master' into dev_master 2024-10-17 17:42:47 +08:00
nisen
78e75db403 Merge branch 'zcwy_0806_paihangb' into dev_master 2024-10-17 17:42:12 +08:00