140 Commits

Author	SHA1	Message	Date
joshen	d10a08da15	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-10 11:12:15 +08:00
joshen	0f3c53cb31	点击 exit 退出 执行效果	2025-03-10 11:11:58 +08:00
joshen	c3797d4d7e	水印的生效 1	2025-03-10 10:52:22 +08:00
joshen	f6a2c08c97	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-10 10:46:42 +08:00
joshen	1f4416e9b1	水印的生效	2025-03-10 10:39:01 +08:00
joshen	072af11080	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-08 11:07:09 +08:00
joshen	2ffe9c1872	去除水印	2025-03-08 11:06:12 +08:00
joshen	9c3b626520	测试一下5	2025-03-07 13:40:10 +08:00
joshen	2fff137908	测试一下4	2025-03-07 13:25:34 +08:00
joshen	8058039f85	测试2	2025-03-07 10:24:38 +08:00
joshen	c1b7a9c9d9	测试一下4	2025-03-06 20:07:14 +08:00
joshen	fd2c4f5096	测试一下3	2025-03-06 20:00:08 +08:00
joshen	c05c69a544	测试一下2	2025-03-06 19:58:21 +08:00
joshen	5966132265	测试一下1	2025-03-06 19:52:30 +08:00
joshen	7214c3f3b5	测试一下	2025-03-06 19:42:48 +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	90ca7e4750	pc播放器拖动修改	2024-10-16 19:53:35 +08:00
joshen	6b6e8a4096	pc视频播放器禁止拖动	2024-10-10 23:07:46 +08:00
joshen	590da41c59	PC视频播放器添加禁止拖动视频	2024-10-10 23:00:16 +08:00
zhangsir	669bf060b7	回退	2024-08-23 19:11:17 +08:00
zhangsir	88ab73354f	考试接口添加参数	2024-08-23 17:45:58 +08:00
zhangsir	34c9864fe5	视频循环调用接口进行限制	2024-08-15 20:15:18 +08:00
zhangsir	0a35bf6023	课程状态、在线课权限	2024-07-05 16:20:14 +08:00
joshen	e860454a2a	Merge branch 'zcwy-master' into 'master' ... 视频加进度 See merge request !119	2024-06-04 17:48:08 +08:00
zhangsir	27a01840cf	视频加进度	2024-06-04 09:26:10 +08:00
joshen	4f1b676bcd	Merge branch 'zcwy-master' into 'master' ... 修改 See merge request !117	2024-06-03 20:50:24 +08:00
zhangsir	7d27f428b5	修改	2024-06-03 20:49:09 +08:00
joshen	62bb40ea6a	Merge branch 'zcwy-master' into 'master' ... Zcwy master See merge request !112	2024-05-28 19:20:54 +08:00
zhangsir	d463e896a6	在线课study回滚	2024-05-28 15:01:48 +08:00
zhangsir	1ea0e209fe	添加参数	2024-05-28 13:49:39 +08:00
joshen	2f24013dac	Merge branch 'zcwy-master' into 'master' ... Zcwy master See merge request !111	2024-05-27 21:16:15 +08:00
zhangsir	17d461cdc4	在线课添加状态	2024-05-27 20:29:16 +08:00
zhangsir	2e099b4f73	视频添加进行状态	2024-05-27 17:15:26 +08:00
zhangsir	3200aeb58e	时间3秒	2024-05-27 17:11:28 +08:00
joshen	7a3e93426f	edit page saveStudyInfo	2024-05-13 17:29:35 +08:00
joshen	2dc6fa182c	edit progress=100	2024-05-12 06:15:25 +08:00
joshen	7ffd784add	delete test alert	2024-05-12 05:59:29 +08:00
joshen	dfe1d9bd84	add test alert	2024-05-12 05:56:28 +08:00
zhangsir	c3b0a1f12e	在线课bug修改	2024-04-26 11:23:24 +08:00
zhangsir	12c4855be9	按钮显示	2024-01-11 13:52:23 +08:00
nisen	5c1ecc348a	修改正常视频暂停播放时十五秒的问题	2023-11-23 11:04:28 +08:00
nisen	8105682cd0	提前调用函数计时	2023-11-22 14:05:52 +08:00
nisen	edec2b7f30	修改正常视频记录时长问题	2023-11-22 13:59:44 +08:00
nisen	18092b9a0b	播放视频时，解决视频加载一直计时问题	2023-11-21 10:17:01 +08:00
nisen	6a811e42bc	修改小数转型	2023-11-20 15:46:50 +08:00
nisen	b4f42f8556	暂停时把时间请空重新计算	2023-11-20 14:31:20 +08:00
nisen	ed2fef1d4b	修改课程案例和文章时长	2023-11-20 13:40:06 +08:00
nisen	a3fb600f4d	修改正常视频浏览器静默状态的上传时间	2023-11-17 14:18:25 +08:00
nisen	a87b9c1e5e	非音频过滤scorm项目	2023-11-09 16:23:25 +08:00
nisen	e0377d8abc	课程详情非音频第一次十五秒发送	2023-11-09 11:37:43 +08:00