Commit Graph

2752 Commits

Author SHA1 Message Date
joshen
e860454a2a Merge branch 'zcwy-master' into 'master'
视频加进度

See merge request !119
2024-06-04 17:48:08 +08:00
zhangsir
27a01840cf 视频加进度 2024-06-04 09:26:10 +08:00
joshen
4a44306eab Merge branch 'zcwy-master' into 'master'
修改二次

See merge request !118
2024-06-03 21:33:58 +08:00
zhangsir
47146754d7 修改二次 2024-06-03 21:32:56 +08:00
joshen
4f1b676bcd Merge branch 'zcwy-master' into 'master'
修改

See merge request !117
2024-06-03 20:50:24 +08:00
zhangsir
7d27f428b5 修改 2024-06-03 20:49:09 +08:00
joshen
635db41f50 Merge branch 'zcwy-master' into 'master'
修改教师搜索

See merge request !116
2024-06-03 20:01:27 +08:00
zhangsir
4649a9db4a 修改教师搜索 2024-06-03 19:56:22 +08:00
joshen
af355db5ea Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !115
2024-06-03 19:16:04 +08:00
zhangsir
a12cd599d7 Merge remote-tracking branch 'boe/zcwy-master' into zcwy-master 2024-06-03 19:07:17 +08:00
zhangsir
5fed77d662 修改视频播放状态 2024-06-03 19:06:58 +08:00
joshen
41f37b3c3e Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !114
2024-06-03 17:47:20 +08:00
zhangsir
b5f4a3655a Merge branch 'zcwy0417-out' into zcwy-master 2024-06-03 11:09:00 +08:00
joshen
5f13e807da Merge branch 'zcwy-master' into 'master'
当前排名

See merge request !113
2024-05-31 20:07:52 +08:00
李志发
04d7e13a62 修改null 2024-05-31 17:34:37 +08:00
李志发
6800956161 修改null 2024-05-31 17:19:35 +08:00
李志发
167612bf3a 修改null 2024-05-31 17:04:30 +08:00
李志发
3da869218a 修改null 2024-05-31 17:00:04 +08:00
李志发
327c0a0b61 Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out 2024-05-31 16:55:58 +08:00
李志发
2b63203354 修改null 2024-05-31 16:55:37 +08:00
zhangsir
2dfe4db873 修改默认文字 2024-05-31 16:07:19 +08:00
李志发
44ebaa791c Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out 2024-05-31 14:29:23 +08:00
李志发
5e335d1c0d 删除假数据 2024-05-31 14:29:14 +08:00
zhangsir
31399063e3 处理返回的图片路径不一样的情况 2024-05-30 16:19:23 +08:00
zhangsir
ddde77d2c6 改为顿号 2024-05-30 16:02:04 +08:00
zhangsir
aac05a2296 图片路径修改 2024-05-30 15:53:12 +08:00
zhangsir
078d64f45d 当前排名 2024-05-30 15:07:56 +08:00
zhangsir
5ab32350f5 配置文件回退 2024-05-30 09:06:18 +08:00
joshen
62bb40ea6a Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !112
2024-05-28 19:20:54 +08:00
zhangsir
0c565e52ab 测试 2024-05-28 18:32:58 +08:00
zhangsir
108c639f1a 测试 2024-05-28 17:45:06 +08:00
zhangsir
d463e896a6 在线课study回滚 2024-05-28 15:01:48 +08:00
zhangsir
2b323bc6f9 不同样式 2024-05-28 14:10:06 +08:00
zhangsir
1ea0e209fe 添加参数 2024-05-28 13:49:39 +08:00
zhangsir
9b16fd3744 还原 2024-05-28 11:37:48 +08:00
zhangsir
5b34379e36 测试 2024-05-28 11:33:36 +08:00
joshen
2f24013dac Merge branch 'zcwy-master' into 'master'
Zcwy master

See merge request !111
2024-05-27 21:16:15 +08:00
zhangsir
17d461cdc4 在线课添加状态 2024-05-27 20:29:16 +08:00
zhangsir
2e099b4f73 视频添加进行状态 2024-05-27 17:15:26 +08:00
zhangsir
3200aeb58e 时间3秒 2024-05-27 17:11:28 +08:00
李志发
6bbebe1286 删除假数据 2024-05-27 17:09:48 +08:00
joshen
7f7a6319f2 Merge branch 'zcwy-master' into 'master'
按钮回显

See merge request !110
2024-05-24 16:59:59 +08:00
李志发
a93b87afd9 修改上传 2024-05-24 16:16:01 +08:00
李志发
45889703d6 修改输入框 2024-05-23 16:01:07 +08:00
李志发
4e6c9301dc 修改地址 2024-05-23 14:53:17 +08:00
李志发
1689e91cde Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out 2024-05-23 09:48:52 +08:00
李志发
f169d8d861 修改地址 2024-05-23 09:47:49 +08:00
zhangsir
a7bdf0ed00 修改图片路径 2024-05-23 09:37:10 +08:00
李志发
7f5c2d5d71 Merge branch 'zcwy0417-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/learning-system-portal into zcwy0417-out 2024-05-22 18:58:42 +08:00
李志发
f20360180b 修改地址 2024-05-22 18:58:28 +08:00