Commit Graph

478 Commits

Author SHA1 Message Date
huangshengfa
2a43f609f2 Merge branch 'pre-manage' into 'release'
Pre manage

See merge request !12
2022-12-28 10:31:33 +08:00
yuping
fdd5cb64cd --版本号 2022-12-28 10:10:59 +08:00
yuping
2abdd068b8 Merge branch 'develop' into manage-release 2022-12-28 09:03:19 +08:00
yuping
a2ba9acb29 Merge branch 'develop' 2022-12-28 09:00:44 +08:00
yuping
a84c14a7fb --报名 2022-12-27 22:41:52 +08:00
huangshengfa
9a6801cec7 Merge branch 'pre-manage' into 'release'
Pre manage

See merge request !11
2022-12-27 21:18:24 +08:00
yuping
9676a1f582 Merge remote-tracking branch 'origin/develop' into manage-release
# Conflicts:
#	src/App.vue
2022-12-27 21:04:20 +08:00
yuping
09de22596c Merge branch 'develop' 2022-12-27 21:01:56 +08:00
yuping
610c80e1c9 Merge remote-tracking branch 'origin/develop' into develop 2022-12-27 21:01:40 +08:00
yuping
6ba78b5dfd 修改配置 2022-12-27 21:01:34 +08:00
wyx
ffaa6475e6 fix:修改版本号 2022-12-27 20:55:47 +08:00
wyx
e24da44dc9 fix:面授评估id修改 2022-12-27 20:52:11 +08:00
wyx
753f56990e fix:面授课报名成功未跳转问题修改 2022-12-27 18:50:55 +08:00
wyx
7a67d9f429 style:路径详情页面课程公告改为路径说明 2022-12-27 18:13:58 +08:00
wyx
acc9609e3b style:项目详情页面课程公告改为项目公告 2022-12-27 18:08:17 +08:00
wyx
47bdea3c49 fix:面授课签到按钮样式问题 2022-12-27 17:55:25 +08:00
wyx
b03c0a924b style:增加未开始作业按钮提示 2022-12-27 16:35:30 +08:00
wuyx
b7b423305e fix:修改版本号 2022-12-27 10:22:56 +08:00
wuyx
6b47bd0545 fix:修改版本号 2022-12-27 10:22:29 +08:00
yujicun
6058c3b755 Merge remote-tracking branch 'origin/manage-release' into release 2022-12-27 09:41:49 +08:00
zhangyc
93832b5302 状态按钮判断 2022-12-27 09:10:27 +08:00
zhangyc
ff30e59467 状态按钮判断 2022-12-27 08:52:11 +08:00
zhangyc
2f578779df Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2022-12-26 23:39:44 +08:00
zhangyc
e2b92a5568 错别字 2022-12-26 23:39:01 +08:00
yuping
26ae5079d1 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into manage-release 2022-12-26 22:08:07 +08:00
yuping
041a3f1af8 -- 列表状态 1是已完成 2022-12-26 22:07:27 +08:00
yuping
3cc323cb5c -- 路径图没有未开始状态 2022-12-26 22:03:04 +08:00
yuping
b5744b7da2 Merge branch 'develop' into manage-release 2022-12-26 21:55:19 +08:00
wyx
a50c337153 style:项目详情页面增加loading 2022-12-26 20:32:24 +08:00
yuping
11a45956b3 -- 修改跳转 2022-12-26 19:28:44 +08:00
yuping
2269cf0ced Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into manage-release 2022-12-26 17:42:39 +08:00
yuping
fed2759ff7 Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 17:42:10 +08:00
yuping
f25ca07a51 -- bug 2022-12-26 17:42:02 +08:00
huangshengfa
82efbaa0fb Merge branch 'pre-manage' into 'release'
Pre manage

See merge request !9
2022-12-26 16:43:25 +08:00
wuyx
9bf3e863ec fix:修改版本号 2022-12-26 16:22:25 +08:00
yuping
20839f3cb2 -- bug 2022-12-26 16:22:25 +08:00
yuping
35d74c3127 -- 参数修改 2022-12-26 16:22:25 +08:00
wuyx
fdd3f084da fix:参数修改 2022-12-26 16:22:25 +08:00
wuyx
4d1a5d78b3 fix:修改参数传递 2022-12-26 16:22:25 +08:00
wuyx
a78ea775f2 fix:修改参数传递 2022-12-26 16:22:25 +08:00
yuping
e64eee5b18 -- 详情不打开新页面 2022-12-26 16:22:25 +08:00
yuping
eca5ace64b -- 详情不打开新页面 2022-12-26 16:22:25 +08:00
wuyx
4cd151cb81 fix:修改版本号 2022-12-26 16:20:41 +08:00
yuping
8d5e31a0ee -- bug 2022-12-26 15:23:29 +08:00
yuping
7fe10b987b -- 参数修改 2022-12-26 13:12:37 +08:00
wuyx
6d398c288d fix:参数修改 2022-12-26 13:08:44 +08:00
yuping
011723ed2c Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 12:59:27 +08:00
yuping
84a5231564 -- 详情不打开新页面 2022-12-26 12:59:17 +08:00
wuyx
9635ff3ac0 fix:修改参数传递 2022-12-26 12:29:33 +08:00
wuyx
919a6724a0 fix:修改参数传递 2022-12-26 12:29:33 +08:00