Commit Graph

2867 Commits

Author SHA1 Message Date
zhangsir
7d15e7ae21 Merge branch 'boe_0705_master' into dev0515 2024-07-10 18:46:02 +08:00
zhangsir
26f2d3f9d3 经验值展示 2024-07-10 18:45:35 +08:00
zhangsir
eb9d68ccd4 Merge branch 'zcwy-master' into dev0515 2024-07-10 16:47:56 +08:00
zhangsir
c98e079684 修改文字 2024-07-10 16:47:29 +08:00
zhangsir
94dc71b911 Merge branch 'zcwy-master' into dev0515 2024-07-10 10:02:57 +08:00
zhangsir
a07f38d33c 修改专业力必修显示问题 2024-07-10 10:02:31 +08:00
zhangsir
cab9c0db2e Merge branch 'boe_0705_master' into dev0515 2024-07-09 17:00:22 +08:00
zhangsir
f193857ec7 经验排行榜增加当前 2024-07-09 16:59:50 +08:00
zhangsir
81642ce1ce Merge branch 'zcwy-master' into dev0515 2024-07-08 19:00:38 +08:00
zhangsir
21cf02d873 修改任务、飞机定位 2024-07-08 19:00:13 +08:00
zhangsir
8f427ab177 Merge branch 'zcwy-master' into dev0515 2024-07-08 10:43:12 +08:00
zhangsir
275e59987f 已读调接口 2024-07-08 10:42:32 +08:00
zhangsir
3ba92a3e02 Merge branch 'zcwy-master' into dev0515
# Conflicts:
#	src/views/study/coursenew.vue
2024-07-08 09:56:44 +08:00
zhangsir
cb43195803 未读数量 2024-07-08 09:54:14 +08:00
zhangsir
ddbb6c7a2e Merge branch 'boe_0705_master' into zcwy-master
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-05 17:31:29 +08:00
zhangsir
0a35bf6023 课程状态、在线课权限 2024-07-05 16:20:14 +08:00
zhangsir
e520fb10d4 Merge branch 'zcwy-master' into dev0515 2024-07-05 14:56:39 +08:00
zhangsir
0e18d143d9 Merge branch 'dev0124' into zcwy-master 2024-07-05 14:56:02 +08:00
zhangsir
a3e17cd87e Merge branch 'zcwy-master' into dev0515 2024-07-05 14:54:01 +08:00
zhangsir
99ea8d35c9 细节 2024-07-05 14:53:23 +08:00
zhangsir
df2e485d31 Merge branch 'boe_0701_icon' into dev0515 2024-07-05 13:16:51 +08:00
zhangsir
c67fcaf48c bug 2024-07-05 13:16:19 +08:00
zhangsir
cab919ba8c Merge branch 'boe_0701_icon' into dev0515 2024-07-05 10:38:09 +08:00
zhangsir
bbb8f44983 bug 2024-07-05 10:37:40 +08:00
zhangsir
57d08b8ced Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:42:56 +08:00
zhangsir
ec3abb9901 只列表添加 2024-07-04 16:42:20 +08:00
zhangsir
88ae166e13 Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:25:18 +08:00
zhangsir
b0c5fcbf8c 在线增加参数 2024-07-04 16:24:42 +08:00
zhangsir
7f1ea1fe89 Merge branch 'boe_0704_line' into dev0515 2024-07-04 11:26:05 +08:00
zhangsir
694c9c5be7 提交增加受众 2024-07-04 11:25:33 +08:00
zhangsir
eeceb3c66e Merge branch 'boe_0701_icon' into dev0515 2024-07-04 11:01:50 +08:00
zhangsir
af05be5f81 一层状态 2024-07-04 11:01:15 +08:00
zhangsir
af6926a74d Merge branch 'boe_0704_line' into dev0515 2024-07-04 09:55:56 +08:00
zhangsir
0b7918331d 受众 2024-07-04 09:55:25 +08:00
zhangsir
9dfdfd7403 Merge branch 'dev0124' into dev0515 2024-07-03 18:19:49 +08:00
zhangsir
dfda1936c7 细节 2024-07-03 18:19:22 +08:00
zhangsir
193e07cfef Merge branch 'boe_0701_icon' into dev0515 2024-07-03 16:14:05 +08:00
zhangsir
2ec5ae3ee0 音频 2024-07-03 16:09:43 +08:00
zhangsir
8d65d8cabb Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:53:57 +08:00
zhangsir
4478cec6f7 作业 2024-07-03 15:53:30 +08:00
zhangsir
895d89dc7a Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:46:13 +08:00
zhangsir
6ec5e4ce45 视频 2024-07-03 15:45:47 +08:00
zhangsir
c46a331c3c Merge branch 'boe_0701_icon' into dev0515 2024-07-03 15:34:08 +08:00
zhangsir
5146e41954 进度 2024-07-03 15:33:35 +08:00
zhangsir
a33bc9885e Merge branch 'boe_0701_icon' into dev0515
# Conflicts:
#	src/views/study/coursenew.vue
2024-07-03 11:40:10 +08:00
zhangsir
3e8ec03c0e 除视频音频考试三秒 2024-07-03 11:37:47 +08:00
zhangsir
b71727263a Merge branch 'boe_0701_icon' into dev0515 2024-07-03 09:45:29 +08:00
zhangsir
e016e1aacc 三秒 2024-07-03 09:44:55 +08:00
zhangsir
cc1970f79f Merge branch 'boe_0701_icon' into dev0515
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-01 17:47:16 +08:00
zhangsir
4e1f2e4e1d 修改图标 2024-07-01 17:44:54 +08:00