hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-09 10:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,912 Commits 71 Branches 0 Tags
3649729c06dccad1f7c742dac667e522d4a5f801
Commit Graph

2912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangsir
fcc452240b Merge branch 'pingcode-20240615' into dev0515 2024-06-19 17:46:09 +08:00
joshen
15f11ae4c9 视频禁用拖动修改 2024-06-19 17:44:44 +08:00
zhangsir
9efcb4660b Merge branch 'zcwy-master' into dev0515 2024-06-19 16:29:43 +08:00
zhangsir
17528eb465 考试状态 2024-06-19 16:28:59 +08:00
zhangsir
b486332cfb Merge branch 'zcwy-master' into dev0515 2024-06-18 15:29:29 +08:00
zhangsir
10f955a58f 修改图片 2024-06-18 15:29:04 +08:00
zhangsir
80700d4b75 Merge branch 'pingcode-20240615' into dev0515 
# Conflicts:
#	src/views/study/coursenew.vue
 2024-06-18 14:36:13 +08:00
joshen
5e3b122984 学员端视频播放器逻辑调整 2024-06-18 14:22:11 +08:00
zhangsir
b0b1f474a8 Merge branch 'dev0124' into dev0515 2024-06-18 11:35:26 +08:00
zhangsir
b691688775 取消错误提示 2024-06-18 11:34:53 +08:00
zhangsir
565a217d91 Merge branch 'dev0124' into dev0515 2024-06-17 09:47:51 +08:00
zhangsir
d8a69328f1 弹窗修改 2024-06-17 09:47:16 +08:00
zhangsir
c47493ac37 Merge branch 'zcwy-master' into dev0515 2024-06-17 08:54:57 +08:00
zhangsir
10e82a1608 修改显示方式 2024-06-17 08:54:33 +08:00
zhangsir
bfd77d8d91 Merge branch 'zcwy-master' into dev0515 2024-06-14 16:19:56 +08:00
zhangsir
a535b6ee85 课程优化 2024-06-14 16:19:28 +08:00
zhangsir
97bc357ec9 Merge branch 'zcwy-master' into dev0515 2024-06-13 17:31:23 +08:00
zhangsir
3264dcaa43 差只展示一个 2024-06-13 17:30:57 +08:00
zhangsir
ab34d540fc Merge branch 'zcwy-master' into dev0515 2024-06-12 18:12:00 +08:00
zhangsir
c37442103a 在线课程修改 2024-06-12 18:11:37 +08:00
zhangsir
37600adfa4 Merge branch 'dev0124' into dev0515 
# Conflicts:
#	src/router/index.js
 2024-06-11 17:33:27 +08:00
zhangsir
549b74d47d 设置空状态 2024-06-11 17:31:35 +08:00
zhangsir
0afaea52ba 成长路径 2024-06-11 17:24:41 +08:00
joshen
e860454a2a Merge branch 'zcwy-master' into 'master' 
视频加进度

See merge request !119
 2024-06-04 17:48:08 +08:00
zhangsir
dd52845b19 修改路径 2024-06-04 11:58:44 +08:00
zhangsir
176e9c91e0 Merge branch 'zcwy-master' into dev0515 2024-06-04 09:26:41 +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
zhangsir
418da40cf0 Merge remote-tracking branch 'boe/dev0515' into dev0515 2024-06-03 21:04:00 +08:00
zhangsir
8400b47e98 Merge branch 'zcwy-master' into dev0515 2024-06-03 21:03:35 +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
zhangsir
2e49d868f9 Merge branch 'zcwy0417-out' into dev0515 2024-05-31 17:36:26 +08:00
李志发
04d7e13a62 修改null 2024-05-31 17:34:37 +08:00
zhangsir
42fae2af8e Merge branch 'zcwy0417-out' into dev0515 2024-05-31 17:21:44 +08:00
李志发
6800956161 修改null 2024-05-31 17:19:35 +08:00
zhangsir
a41b05527d Merge branch 'zcwy0417-out' into dev0515 2024-05-31 17:05:19 +08:00
李志发
167612bf3a 修改null 2024-05-31 17:04:30 +08:00
李志发
3da869218a 修改null 2024-05-31 17:00:04 +08:00
zhangsir
e80df14870 Merge branch 'zcwy0417-out' into dev0515 2024-05-31 16:57:12 +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