134 Commits

Author	SHA1	Message	Date
zhangsir	80700d4b75	Merge branch 'pingcode-20240615' into dev0515 ... # Conflicts: # src/views/study/coursenew.vue	2024-06-18 14:36:13 +08:00
joshen	5e3b122984	学员端视频播放器逻辑调整	2024-06-18 14:22:11 +08:00
zhangsir	c47493ac37	Merge branch 'zcwy-master' into dev0515	2024-06-17 08:54:57 +08:00
zhangsir	10e82a1608	修改显示方式	2024-06-17 08:54:33 +08:00
zhangsir	bfd77d8d91	Merge branch 'zcwy-master' into dev0515	2024-06-14 16:19:56 +08:00
zhangsir	a535b6ee85	课程优化	2024-06-14 16:19:28 +08:00
zhangsir	97bc357ec9	Merge branch 'zcwy-master' into dev0515	2024-06-13 17:31:23 +08:00
zhangsir	3264dcaa43	差只展示一个	2024-06-13 17:30:57 +08:00
zhangsir	ab34d540fc	Merge branch 'zcwy-master' into dev0515	2024-06-12 18:12:00 +08:00
zhangsir	c37442103a	在线课程修改	2024-06-12 18:11:37 +08:00
joshen	e860454a2a	Merge branch 'zcwy-master' into 'master' ... 视频加进度 See merge request !119	2024-06-04 17:48:08 +08:00
zhangsir	176e9c91e0	Merge branch 'zcwy-master' into dev0515	2024-06-04 09:26:41 +08:00
zhangsir	27a01840cf	视频加进度	2024-06-04 09:26:10 +08:00
zhangsir	8400b47e98	Merge branch 'zcwy-master' into dev0515	2024-06-03 21:03:35 +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	afc7786f8f	Merge branch 'zcwy-master' into dev0515	2024-05-28 15:02:15 +08:00
zhangsir	d463e896a6	在线课study回滚	2024-05-28 15:01:48 +08:00
zhangsir	db234d1afb	Merge branch 'zcwy-master' into dev0515	2024-05-28 13:50:06 +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	9122ae203b	Merge branch 'zcwy-master' into dev0515	2024-05-27 20:29:46 +08:00
zhangsir	17d461cdc4	在线课添加状态	2024-05-27 20:29:16 +08:00
zhangsir	ffd01d6d2f	Merge branch 'zcwy-master' into dev0515	2024-05-27 17:15:51 +08:00
zhangsir	2e099b4f73	视频添加进行状态	2024-05-27 17:15:26 +08:00
zhangsir	89e1bf8328	Merge branch 'zcwy-master' into dev0515	2024-05-27 17:12:10 +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
nisen	b560ba9bea	非视频情况设置成三十分钟	2023-11-07 18:04:54 +08:00
nisen	a6d2a6c898	还原拉取进度条的时间	2023-11-07 15:17:31 +08:00
nisen	c67e5b3ee0	修改拖拽视频send参数	2023-11-03 15:32:05 +08:00
nisen	c34546ae3f	修改视频时长的拖拽计时问题	2023-11-03 14:56:19 +08:00
nisen	0938aa7fea	修改ifrma跳转的类型不计时	2023-11-02 18:32:23 +08:00
NiSen	51470f2b2b	去掉课程非音频的60秒计时	2023-10-19 10:01:56 +08:00