Commit Graph

970 Commits

Author SHA1 Message Date
wyx
32440fbfcf fix:修改版本号 2023-03-21 22:23:02 +08:00
wyx
436594e371 fix:修改版本号 2023-03-21 16:31:41 +08:00
wyx
4d34ffe6a0 style:面授课未开放界面样式修改 2023-03-21 13:41:32 +08:00
wyx
3d4415c1d8 fix:修改版本号 2023-03-21 08:51:19 +08:00
yuping
f8e23daa63 --demand 面授课 2023-03-21 00:31:17 +08:00
yuping
dcf229f3b0 Merge remote-tracking branch 'origin/develop' into develop 2023-03-20 19:37:09 +08:00
yuping
360d175a5c --demand 面授课 2023-03-20 19:36:56 +08:00
wyx
7d21028138 fix:修改版本号 2023-03-20 15:46:41 +08:00
yuping
8799f838a7 Merge remote-tracking branch 'origin/develop' into develop 2023-03-20 15:21:19 +08:00
yuping
18b3fb4915 --demand 面授课 2023-03-20 15:21:07 +08:00
wyx
ecc832fa2d fix:评估点击无反应问题 2023-03-20 15:12:53 +08:00
wyx
9c911216a6 fix:点击交作业无反应问题 2023-03-20 15:03:11 +08:00
yuping
e0e61720fa --demand 面授课 2023-03-20 14:55:55 +08:00
wyx
0edd407c8a fix:修改版本号 2023-03-20 08:49:06 +08:00
wyx
cb51f5c0ec fix:面授课报名页面材料下载修改 2023-03-17 15:01:55 +08:00
wyx
b86fdadede fix:修改版本号 2023-03-17 09:13:03 +08:00
yuping
b595cd6092 --demand 面授课 2023-03-17 03:07:58 +08:00
yuping
2481ceebf4 fix -- 评估bug 2023-03-14 11:29:11 +08:00
yuping
0395b6735c Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu
 Conflicts:
	src/App.vue
2023-03-14 11:28:18 +08:00
yuping
723545e9c5 Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into manage-release 2023-03-13 21:34:23 +08:00
yuping
f546506852 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into manage-release 2023-03-13 21:33:31 +08:00
yuping
a9b641302a fix -- 评估bug 2023-03-13 20:31:44 +08:00
李东进1
155eb86dc5 下载路径问题 2023-03-10 23:14:46 +08:00
huangshengfa
83fbdf1134 Merge branch 'pre-master' into 'master'
Pre master

See merge request !35
2023-03-10 20:24:45 +08:00
wyx
3f5abbbbd1 fix:修改版本号 2023-03-10 19:32:39 +08:00
wyx
dd8c41baf9 fix:修改版本号 2023-03-10 19:32:13 +08:00
wyx
35f782ec3d Merge branch 'manage-release' 2023-03-10 19:30:35 +08:00
wyx
46923ed4dd Merge branch 'develop' into manage-release 2023-03-10 19:30:11 +08:00
wyx
85e11af6af fix:讲师名称 2023-03-10 19:15:33 +08:00
yujicun
2ab558c639 Merge remote-tracking branch 'origin/master' 2023-03-10 17:41:24 +08:00
wyx
bf6ef1d532 fix:修改版本号 2023-03-10 16:59:31 +08:00
wyx
5df37f3fd5 fix:修改版本号 2023-03-10 16:58:33 +08:00
wyx
c3e3dd6f94 Merge branch 'develop' into manage-release 2023-03-10 16:57:57 +08:00
wyx
8518d34749 fix:修改直播评估跳转参数传递 2023-03-10 16:55:41 +08:00
wyx
2f03fff7e9 fix:直播教师头像显示问题 2023-03-10 14:31:50 +08:00
yujicun
d7da1c7012 Merge remote-tracking branch 'origin/master' 2023-03-10 01:46:32 +08:00
wyx
cbaf1bc8b6 fix:修改版本号 2023-03-10 01:38:54 +08:00
huangshengfa
593b171e99 Merge branch 'pre-master' into 'master'
Pre master

See merge request !33
2023-03-09 21:38:02 +08:00
wyx
7988aab1bf Merge branch 'manage-release' 2023-03-09 21:07:31 +08:00
wyx
31a84f3ec5 Merge branch 'develop' into manage-release 2023-03-09 21:07:01 +08:00
wyx
bc8c6fcbb9 fix:修改生产环境文件路径 2023-03-09 21:06:06 +08:00
huangshengfa
63ab0d71fb Merge branch 'pre-master' into 'master'
Pre master

See merge request !32
2023-03-09 18:41:58 +08:00
wyx
02a626887c fix:修改版本号 2023-03-09 18:23:57 +08:00
wyx
0dafad80df fix:修改版本号 2023-03-09 18:23:17 +08:00
yuping
9d8e35941d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/App.vue
2023-03-09 18:13:19 +08:00
yuping
92918112a5 fix -- 关卡太多只展示8个 2023-03-09 18:12:57 +08:00
wyx
c060b154e4 fix:修改版本号 2023-03-09 18:08:24 +08:00
yuping
6f7f310568 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/App.vue
2023-03-09 18:06:07 +08:00
yuping
df1da5242d Merge remote-tracking branch 'origin/manage-release'
# Conflicts:
#	src/App.vue
#	src/views/faceteach/FaceTeachSignUp.vue
2023-03-09 18:04:56 +08:00
wyx
63a102056c fix:合并 2023-03-09 18:04:10 +08:00