653 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nisen	6a9f59d3ad	打包	2023-11-23 11:20:05 +08:00
joshen	1d4cba2a1d	Merge branch 'zcwyMaster' into 'dev0731' ... 修改正常视频停止播放从十五秒开始 See merge request !19	2023-11-23 11:15:05 +08:00
nisen	93dd3519a9	修改正常视频停止播放从十五秒开始	2023-11-23 11:07:42 +08:00
nisen	07cd20a8bf	编译	2023-11-22 14:30:59 +08:00
joshen	2766a2202e	Merge branch 'zcwyMaster' into 'dev0731' ... 修改正常音视频播放计时 See merge request !18	2023-11-22 14:25:04 +08:00
nisen	1109276445	修改正常音视频播放计时	2023-11-22 14:24:13 +08:00
nisen	19c5ff61e4	打包	2023-11-21 17:28:15 +08:00
nisen	d9cad5e414	Merge branch 'zcwyMaster' into dev0731	2023-11-21 17:24:15 +08:00
nisen	f0d00efd5e	编译	2023-11-21 17:15:09 +08:00
joshen	baad7ce485	Merge branch 'zcwyMaster' into 'master' ... 音频自动结束清除计时 See merge request !17	2023-11-21 17:11:55 +08:00
nisen	e16ca48c4a	音频自动结束清除计时	2023-11-21 17:11:05 +08:00
nisen	a7451bc506	打包	2023-11-21 16:14:55 +08:00
joshen	ead59a0c4f	Merge branch 'zcwyMaster' into 'master' ... Zcwy master See merge request !16	2023-11-21 16:11:35 +08:00
nisen	e46f0d932c	打包	2023-11-21 15:14:39 +08:00
joshen	597c3ba4b3	Merge branch 'zcwyMaster' into 'dev0731' ... 音视频注释onHide生命周期 See merge request !15	2023-11-21 15:06:28 +08:00
nisen	941de8ffc7	音视频注释onHide生命周期	2023-11-21 14:58:39 +08:00
nisen	9e93d63cbd	打包	2023-11-20 17:34:52 +08:00
joshen	15577e5f38	Merge branch 'zcwyMaster' into 'dev0731' ... 修改传递参数变量 See merge request !14	2023-11-20 17:31:46 +08:00
nisen	1f635ae528	修改传递参数变量	2023-11-20 17:31:12 +08:00
nisen	481411e009	打包h5	2023-11-20 17:25:06 +08:00
joshen	6f76ec791c	Merge branch 'zcwyMaster' into 'dev0731' ... Zcwy master See merge request !13	2023-11-20 17:20:43 +08:00
nisen	58645d9718	正常音频计时	2023-11-20 17:15:26 +08:00
nisen	5d7df19bce	文章计时	2023-11-20 17:12:50 +08:00
nisen	5e958a941b	打包	2023-11-16 18:21:25 +08:00
nisen	d2fe11e3c8	打包	2023-11-16 18:08:10 +08:00
nisen	5430aa8e4c	Merge branch 'zcwyMaster' into dev0731	2023-11-16 18:03:07 +08:00
nisen	6f05888db7	正常视频播放事件	2023-11-16 17:57:53 +08:00
nisen	381fcd9130	文章计时，最多三十分钟	2023-11-16 17:31:19 +08:00
joshen	0bfe45475a	Merge branch 'zcwyMaster' into 'master' ... 重新打包 See merge request !10	2023-10-31 17:44:32 +08:00
nisen	e6b147ae35	重新打包	2023-10-31 17:43:52 +08:00
joshen	29d485d8c4	Merge branch 'master_1030' into 'master' ... Master 1030 See merge request !9	2023-10-30 20:22:28 +08:00
joshen	25c740ac24	Merge branch 'zcwyMaster' into 'master_1030' ... Zcwy master See merge request !8	2023-10-30 20:05:38 +08:00
joshen	f21d56fff1	Merge branch 'zcwyMaster' into 'dev0731' ... '解绑按钮状态显示修改' See merge request !7	2023-10-21 14:16:26 +08:00
yujicun	aac80256a2	'解绑按钮状态显示修改'	2023-10-21 12:01:08 +08:00
nisen	048f39ddad	打包h5	2023-10-19 18:05:41 +08:00
nisen	4e01a72441	Merge branch 'zcwyMaster' into dev0731	2023-10-18 09:49:29 +08:00
nisen	7c10b66ec0	修改解绑状态	2023-10-18 09:48:15 +08:00
nisen	23597d7599	打包	2023-10-17 20:55:15 +08:00
joshen@zcwytd.com	91022d1406	Merge branch 'zcwyMaster' into dev0731 ... # Conflicts: # unpackage/dist/build/h5/index.html	2023-10-17 20:33:23 +08:00
nisen	eb9e3f6b91	解绑openId	2023-10-17 15:43:13 +08:00
BOE\10867418	6f4ef2e32a	重新编译	2023-08-10 17:52:25 +08:00
BOE\10867418	e61a4a2810	Merge branch 'cloud'	2023-08-10 17:50:28 +08:00
BOE\10867418	3756815c62	编译	2023-08-10 17:29:47 +08:00
BOE\10867418	e03394727a	Merge branch 'cloud' into dev0731	2023-08-10 17:27:04 +08:00
daihh	3411796caf	对修改密码进行加密处理	2023-08-10 17:22:37 +08:00
yujicun	b0fc8df4b7	重新编译	2023-08-10 11:44:25 +08:00
yujicun	78579c71dd	Merge remote-tracking branch 'boe/cloud'	2023-08-10 11:25:33 +08:00
daihh	1889335347	退出清空调整	2023-08-10 11:19:59 +08:00
BOE\10867418	3e358afa08	提交	2023-08-08 18:56:35 +08:00
yujicun	9a96ef1977	重新编译	2023-08-02 16:44:00 +08:00