2963 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
joshen	fab62c4f7f	Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220	2025-04-03 15:23:44 +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
joshen	535681749c	Merge remote-tracking branch 'yx/master_20250319-lyc' into test20250220	2025-03-28 13:20:26 +08:00
670788339	f9e332ab7c	SZX-1045	2025-03-28 11:47:43 +08:00
joshen	da481c72c5	Merge branch '250321-bugfix-shl' into test20250220	2025-03-24 10:21:57 +08:00
sunhonglai	0989360183	Merge remote-tracking branch 'origin/250321-bugfix-shl' into 250321-bugfix-shl ... # Conflicts: # src/views/Login.vue	2025-03-24 08:31:59 +08:00
sunhonglai	5e31f7d1a8	注掉废弃的登录页面	2025-03-24 08:31:27 +08:00
sunhonglai	eaa7f04cd6	删除废弃的登录页面	2025-03-21 16:52:47 +08:00
sunhonglai	0d7a2ad353	修改响应结果空指针问题	2025-03-21 15:48:40 +08:00
joshen	374dfb6b3d	Merge branch 'master_20250319-lyc' into test20250220 ... # Conflicts: # src/views/portal/case/Index.vue	2025-03-19 13:35:37 +08:00
670788339	9d9d663591	课程详情显示供应商	2025-03-19 13:31:50 +08:00
joshen	d212938819	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-19 09:22:53 +08:00
gengxin	14220b6d4d	考试整理1	2025-03-19 09:21:36 +08:00
joshen	bbaa86ff92	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-19 08:51:24 +08:00
gengxin	2a2cb22fe9	考试整理	2025-03-19 08:49:45 +08:00
joshen	90b53a54b2	Merge branch '250220-pre-126-177-gx' into master_1202	2025-03-13 17:38:58 +08:00
gengxin	b89a8266e5	考试完成判断3	2025-03-13 17:37:33 +08:00
joshen	49137387f6	Merge branch '250220-pre-126-177-gx' into master_1202	2025-03-13 17:16:32 +08:00
joshen	94c82417a2	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-13 16:39:31 +08:00
gengxin	812c09d65c	考试完成判断	2025-03-13 16:38:33 +08:00
joshen	6cc3e1345c	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-13 16:33:20 +08:00
gengxin	57a87db016	考试状态修改	2025-03-13 16:32:02 +08:00
joshen	603bf9a63e	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-13 16:25:16 +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
joshen	49c85c49fb	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-12 17:02:03 +08:00
gengxin	7162d329ee	考试及格线	2025-03-12 17:00:25 +08:00
joshen	35d829c74f	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-12 16:30:13 +08:00
gengxin	d7d80e8244	考试及格线获取	2025-03-12 16:27:44 +08:00
joshen	af208d0a6d	部署生产1	2025-03-11 17:15:07 +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
joshen	7b59c71b71	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:52:21 +08:00
gengxin	def3892edc	退出全屏 ，需要水印12	2025-03-11 11:51:51 +08:00
joshen	73d22a5b03	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:45:57 +08:00
gengxin	51a8da4bdb	退出全屏 ，需要水印11	2025-03-11 11:45:34 +08:00
joshen	6790facaaf	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:29:31 +08:00
gengxin	6536e36857	退出全屏 ，需要水印10	2025-03-11 11:29:14 +08:00
joshen	9eee28f8c2	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:26:44 +08:00
gengxin	1bf9398177	退出全屏 ，需要水印9	2025-03-11 11:26:11 +08:00
joshen	d862d6e47d	Merge branch '250220-pre-126-177-gx' into test20250220 ... # Conflicts: # src/components/VideoPlayer/index.vue	2025-03-11 11:16:45 +08:00
gengxin	a5333952c9	退出全屏 ，需要水印8	2025-03-11 11:15:18 +08:00
joshen	7786efbd38	退出全屏 esc 触发监听4	2025-03-11 11:10:55 +08:00
joshen	9de579acb3	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:09:47 +08:00
gengxin	127f191776	退出全屏 ，需要水印7	2025-03-11 11:09:19 +08:00
joshen	023d7a1372	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:05:18 +08:00
gengxin	e9b9a14b69	退出全屏 ，需要水印6	2025-03-11 11:04:53 +08:00
joshen	cff501050c	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 11:01:08 +08:00
gengxin	11a1065df9	退出全屏 ，需要水印5	2025-03-11 11:00:45 +08:00