3062 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
gengxin	797c08d8fc	退出全屏 ，需要水印	2025-03-10 14:54:46 +08:00
joshen	ead86f65bc	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-10 14:46:52 +08:00
gengxin	a8d44d0169	播放加上水印	2025-03-10 14:46:03 +08:00
joshen	822f885553	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-10 14:22:30 +08:00
joshen	567bed812b	退出全屏 esc 触发监听4	2025-03-10 14:21:58 +08:00
joshen	53aa40cee3	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-10 14:17:46 +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	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	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	e6fa45a5ac	测试一下6	2025-03-06 20:58:28 +08:00
joshen	0d904de3ed	测试一下5	2025-03-06 20:27:34 +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	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	bada958769	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-05 07:47:39 +08:00
gengxin	9fba452d2d	弹出框处理	2025-03-05 07:46:22 +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	d2077ddb5c	Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220	2025-02-27 21:27:00 +08:00
joshen	d33e27b3d0	Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into master_1202	2025-02-27 21:07:42 +08:00
Pengxiansen	3d3f2ebc6e	提交	2025-02-27 21:02:06 +08:00