Commit Graph

906 Commits

Author SHA1 Message Date
zhangsir
df4317303a Merge branch 'zcwy0417-out' into dev0515 2024-05-31 14:40:00 +08:00
李志发
5e335d1c0d 删除假数据 2024-05-31 14:29:14 +08:00
zhangsir
fec81d2357 Merge remote-tracking branch 'boe/dev0515' into dev0515 2024-05-27 17:12:36 +08:00
zhangsir
89e1bf8328 Merge branch 'zcwy-master' into dev0515 2024-05-27 17:12:10 +08:00
zhangsir
3200aeb58e 时间3秒 2024-05-27 17:11:28 +08:00
zhangsir
d46a06ad67 Merge branch 'zcwy0417-out' into dev0515 2024-05-23 16:03:53 +08:00
李志发
45889703d6 修改输入框 2024-05-23 16:01:07 +08:00
zhangsir
ad81d4460a Merge branch 'zcwy0417-out' into dev0515 2024-05-23 14:56:21 +08:00
李志发
4e6c9301dc 修改地址 2024-05-23 14:53:17 +08:00
zhangsir
21bfad07c1 Merge branch 'zcwy0417-out' into dev0515 2024-05-23 09:54:14 +08:00
李志发
f169d8d861 修改地址 2024-05-23 09:47:49 +08:00
zhangsir
65501c9d9f Merge branch 'zcwy0417-out' into dev0515 2024-05-22 19:01:51 +08:00
李志发
f20360180b 修改地址 2024-05-22 18:58:28 +08:00
zhangsir
474595d228 Merge branch 'zcwy-master' into dev0515 2024-05-22 14:59:45 +08:00
zhangsir
565fb680fc 按钮回显 2024-05-22 14:56:44 +08:00
zhangsir
7a3b970dc4 Merge branch 'zcwy0417-out' into dev0515 2024-05-22 12:26:17 +08:00
李志发
958a93c935 修改bug3.0 2024-05-22 12:20:10 +08:00
zhangsir
fc7d154f98 Merge branch 'zcwy0417-out' into dev0515 2024-05-20 08:40:57 +08:00
李志发
4ed5f98ea1 修改bug2.0 2024-05-18 00:48:44 +08:00
joshen
6aba380f00 Merge branch 'zcwy-master' into 'dev0515'
Zcwy master

See merge request !107
2024-05-17 10:52:15 +08:00
zhangsir
f8a897aed1 Merge branch 'zcwy0417-out' into dev0515 2024-05-17 09:50:05 +08:00
李志发
c3d34b0c66 修改 2024-05-17 09:27:15 +08:00
zhangsir
e2245c2806 Merge branch 'zcwy0417-out' into dev0515 2024-05-16 11:59:08 +08:00
李志发
77ac1f3222 打通流程 2024-05-16 11:57:31 +08:00
zhangsir
3494329988 Merge branch 'zcwy0417-out' into dev0515 2024-05-15 22:36:37 +08:00
李志发
700dee82c9 提交讲师 2024-05-15 13:29:03 +08:00
zhangsir
dfab1036b0 考试状态修改 2024-05-13 16:15:37 +08:00
zhangsir
5ac79f129c Merge branch 'zcwy-0509-exam' into zcwy-master
# Conflicts:
#	src/components/Course/exam.vue
2024-05-13 15:54:38 +08:00
zhangsir
835d2c3527 修改考试提交方式改为有返回值可再次点击点击 2024-05-09 16:19:04 +08:00
zhangsir
373246f26f 考试学习状态修改 2024-05-09 14:17:20 +08:00
zhangsir
37544bea60 考试学习状态修改 2024-05-09 13:27:49 +08:00
zhangsir
e04f249245 考试提交改为5秒内只执行一次 2024-05-07 08:48:14 +08:00
zhangsir
2bc093fae1 专区下拉名字修改 2024-04-26 16:12:37 +08:00
zhangsir
05e5993beb 放开提交按钮 2024-04-26 13:21:59 +08:00
zhangsir
c3b0a1f12e 在线课bug修改 2024-04-26 11:23:24 +08:00
zhangsir
931586a65d u选小课堂改为通用力专区 2024-04-25 15:09:36 +08:00
zhangsir
065e6cd1ad Merge branch 'master' into zcwy-master 2024-01-11 17:34:32 +08:00
zhangsir
12f4bd8abb 取消选择 2024-01-11 17:34:08 +08:00
zhangsir
13543d1f73 Merge branch 'master' into zcwy-master 2024-01-10 17:58:59 +08:00
zhangsir
1128913efb 2022 2024-01-10 17:57:42 +08:00
zhangsir
ed0d7596eb Merge branch 'master' into zcwy-master 2024-01-10 16:50:05 +08:00
zhangsir
aed889bc4b 2024-01-10 16:49:21 +08:00
zhangsir
83323ec464 Merge branch 'master' into zcwy-master 2024-01-10 16:25:11 +08:00
zhangsir
49d2f876c0 修改 2024-01-10 16:24:18 +08:00
zhangsir
6be23aac22 Merge branch 'master' into zcwy-master 2024-01-10 11:08:49 +08:00
zhangsir
8fa0466af7 增加 2024-01-10 10:41:56 +08:00
joshen
7b4e9cb5f8 Merge branch 'zcwyTeacher' into 'master'
Zcwy teacher

See merge request !89
2023-11-21 16:11:14 +08:00
nisen
ac94879005 结束函数更换 2023-11-21 13:20:15 +08:00
nisen
18092b9a0b 播放视频时,解决视频加载一直计时问题 2023-11-21 10:17:01 +08:00
joshen
f12eaad639 Merge branch 'zcwyTeacher' into 'master'
Zcwy teacher

See merge request !83
2023-11-10 17:19:51 +08:00