Commit Graph

3098 Commits

Author SHA1 Message Date
zhangsir
642907b386 Merge branch 'zcwy_0822_case' into dev0515
# Conflicts:
#	src/views/lecturer/TwoCoaching.vue
2024-11-04 15:30:12 +08:00
zhangsir
548d891be3 一上来搜索的条数改为20 2024-11-04 15:28:38 +08:00
zhangsir
0dc3884d46 讲师认证修改参数改为keyword 2024-11-01 17:03:33 +08:00
zhangsir
ecfc6fcae7 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-11-01 14:28:48 +08:00
zhangsir
de88a75aaa 视频取消token参数,改为sign增加工号 2024-11-01 14:27:50 +08:00
zhangsir
a8fe656436 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-11-01 11:14:37 +08:00
zhangsir
b6bc60d8b9 视频增加token参数不加密 2024-11-01 11:13:53 +08:00
zhangsir
263bd22e5e Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-31 19:05:22 +08:00
zhangsir
22668d756f 视频增加token参数 2024-10-31 19:04:20 +08:00
zhangsir
22861dadf2 userNo修改参数 2024-10-30 17:57:56 +08:00
zhangsir
cd19cd5f66 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-30 17:48:13 +08:00
zhangsir
041643a135 都改 2024-10-30 17:47:33 +08:00
zhangsir
885c7f9242 再改 2024-10-30 17:39:47 +08:00
zhangsir
6fd33ddd88 再改 2024-10-30 17:38:36 +08:00
zhangsir
f688f5086f Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-30 17:27:04 +08:00
zhangsir
3d4d3f4d25 改回去 2024-10-30 17:26:22 +08:00
zhangsir
cb954b8bce Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-30 15:20:43 +08:00
zhangsir
b386681aab userNo修改参数 2024-10-30 15:20:01 +08:00
zhangsir
eaf16801df Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-29 16:12:34 +08:00
zhangsir
4649580e6a 文字最大50 2024-10-29 16:11:59 +08:00
zhangsir
8872a41f31 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-29 15:58:41 +08:00
zhangsir
9eaf352cc3 最大999 2024-10-29 15:57:54 +08:00
zhangsir
14e05af3e5 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-29 14:55:01 +08:00
zhangsir
fd73a396d5 转换输入框 2024-10-29 14:54:20 +08:00
zhangsir
9e9141b424 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-28 19:03:22 +08:00
zhangsir
ab39bb3cf5 加载中 2024-10-28 19:02:42 +08:00
zhangsir
4cd553af41 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-28 17:35:14 +08:00
zhangsir
6ab1d86c53 加载中 2024-10-28 17:34:29 +08:00
zhangsir
a9d76bc959 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-28 16:52:31 +08:00
zhangsir
5ef39ae9dc 加载中 2024-10-28 16:51:45 +08:00
zhangsir
7679f78ef5 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-25 17:29:03 +08:00
zhangsir
45fb650b1b 上传视频的超时提示 2024-10-25 17:28:18 +08:00
zhangsir
bd2c58e03d Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-22 16:56:23 +08:00
zhangsir
3aa2229dbd 上传视频的提示 2024-10-22 16:55:29 +08:00
zhangsir
345a68111d Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-17 09:15:10 +08:00
zhangsir
0ebbb0399f 学习天数修改 2024-10-17 09:13:49 +08:00
zhangsir
8f014f65ab Merge remote-tracking branch 'boe/dev0515' into dev0515 2024-10-16 16:50:32 +08:00
zhangsir
da4a563d03 Merge branch 'zcwy_0806_paihangb' into dev0515 2024-10-16 16:49:59 +08:00
zhangsir
14a94d1fb1 排行榜修改 2024-10-16 16:49:14 +08:00
zhangsir
2fc835ca8d 认证讲师库修改名字 2024-10-09 13:45:54 +08:00
zhangsir
dc01a523f7 新增视频缓存打印 2024-10-09 12:15:08 +08:00
nisen
b9a24bcf29 Merge branch 'zcwy_0723_hotforum' into dev0515 2024-10-09 11:23:28 +08:00
zhangsir
ea910687f5 删除打印 2024-10-09 11:20:15 +08:00
nisen
c326322469 Merge branch 'zcwy_0723_hotforum' into dev0515 2024-10-09 11:11:46 +08:00
zhangsir
f27d82c536 打印报错信息 2024-10-09 11:10:48 +08:00
nisen
24d45506ce Merge branch 'zcwy_0723_hotforum' into dev0515 2024-10-09 10:52:25 +08:00
zhangsir
f6c4e984df 打印报错信息 2024-10-09 10:51:19 +08:00
nisen
ffcc049215 Merge branch 'zcwy_0723_hotforum' into dev0515 2024-10-09 09:18:14 +08:00
zhangsir
14bf033539 自定义考试修改数据结构 2024-10-09 09:16:05 +08:00
nisen
f1341430ad Merge branch 'zcwy_0723_hotforum' into dev0515
# Conflicts:
#	src/components/Course/exam.vue
2024-10-08 15:57:49 +08:00