Commit Graph

451 Commits

Author SHA1 Message Date
yuping
414aa9831f -- 测评 2022-12-30 17:02:34 +08:00
yuping
51744fd187 Merge remote-tracking branch 'origin/develop' 2022-12-30 17:01:32 +08:00
yuping
1b008e3ef6 -- 测评 2022-12-30 17:01:10 +08:00
yuping
8e5e5734f0 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	src/App.vue
2022-12-30 16:26:05 +08:00
yuping
6eb6bacc9c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/project/ProjectDetails.vue
2022-12-30 16:18:26 +08:00
yuping
76588c05a1 -- 状态 2022-12-30 16:17:32 +08:00
wyx
4d9b51b3ce fix:修改版本号 2022-12-30 15:37:43 +08:00
wyx
65f19cb014 fix:修改项目详情下案例外联已完成状态 2022-12-30 14:31:40 +08:00
wyx
1605258d06 fix:修改版本号 2022-12-30 11:07:07 +08:00
wyx
9b5325dd6b fix:面授课附件显示问题 2022-12-30 09:53:50 +08:00
wyx
7356eec843 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2022-12-29 19:07:10 +08:00
wyx
16b18f5c98 fix:判断参数修改 2022-12-29 19:07:05 +08:00
yuping
f20a106a98 Merge remote-tracking branch 'origin/develop' into develop 2022-12-29 19:06:59 +08:00
yuping
9ae7fcd6c9 -- 是否允许公开报名 2022-12-29 19:06:53 +08:00
wyx
247f82a04b fix:增加项目详情当项目结束时候任务得提示及跳转到对应任务页面隐藏判断 2022-12-29 18:34:35 +08:00
wyx
6f3347cc1f fix:无阶段活动展示问题 2022-12-29 14:52:46 +08:00
wyx
4c8101d6ad fix:活动签到逻辑修改 2022-12-29 14:49:38 +08:00
wyx
c1186676ad fix:面授课详情界面课程开始时间结束时间错误修改 2022-12-29 11:11:02 +08:00
yuping
07b4ae218f -- 提示 2022-12-29 00:11:55 +08:00
yuping
f880a42fa2 Merge remote-tracking branch 'origin/manage-release' 2022-12-29 00:11:31 +08:00
yuping
cdcd3ae95f Merge remote-tracking branch 'origin/develop' into manage-release 2022-12-29 00:11:08 +08:00
yuping
048404c8ca Merge branch 'develop' into manage-release
# Conflicts:
#	src/router/index.js
2022-12-29 00:09:55 +08:00
wuyx
7191bb4ad6 fix:作业课程参数修改 2022-12-29 00:08:53 +08:00
yuping
334d04b59b -- 提示 2022-12-29 00:07:23 +08:00
yuping
a78ecd6b95 -- 提示 2022-12-29 00:00:01 +08:00
yuping
529c91bc46 -- 配置 2022-12-28 23:16:41 +08:00
yuping
4f5efab57c -- 正式环境配置 2022-12-28 23:15:14 +08:00
yuping
8ee92dda70 Merge remote-tracking branch 'origin/manage-release' 2022-12-28 22:36:32 +08:00
yuping
d68110cd9b -- 正式环境配置 2022-12-28 22:36:12 +08:00
yuping
e0551f1f3b -- 版本 2022-12-28 20:02:59 +08:00
yuping
925f7ff47b Merge remote-tracking branch 'origin/manage-release' 2022-12-28 19:58:55 +08:00
yuping
82216c755e -- 版本 2022-12-28 19:05:42 +08:00
yuping
a96a411d72 Merge branch 'develop' into manage-release 2022-12-28 19:00:20 +08:00
yuping
b96b99c4f2 Merge remote-tracking branch 'origin/develop' into develop 2022-12-28 18:59:56 +08:00
yuping
12d5cae847 -- 在线课进度 2022-12-28 18:59:27 +08:00
wyx
b84518b553 style:当面授直播无评估的时候,隐藏评估按钮 2022-12-28 17:38:14 +08:00
yuping
2ae772a0c2 -- 测试环境url去除域名 2022-12-28 15:02:46 +08:00
wyx
b00d029ef7 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop 2022-12-28 14:54:40 +08:00
wyx
505e8124b2 fix:面授课详情课程考试名称-考试名称修改 2022-12-28 14:54:34 +08:00
yuping
c819f0bd0d -- 测试环境url去除域名 2022-12-28 14:30:51 +08:00
yuping
64b3a732f6 -- 测试环境url去除域名 2022-12-28 14:30:25 +08:00
yuping
624fda7c8f -- 测试环境url去除域名 2022-12-28 14:29:59 +08:00
yuping
d820c2779e -- 测试环境url去除域名 2022-12-28 14:29:17 +08:00
yuping
e9d250e835 -- 测试环境url去除域名 2022-12-28 14:27:44 +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
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