2931 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
joshen	53e162edee	Merge branch '250220-pre-126-177-gx' into test20250220	2025-03-11 10:53:09 +08:00
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