Commit Graph

3529 Commits

Author SHA1 Message Date
bjzhoujian
a6adefe74c 调试回车导致弹窗闪动 2025-11-25 12:08:12 +08:00
bjzhoujian
a69d9843f7 调试回车导致弹窗闪动 2025-11-25 11:04:44 +08:00
joshen
c7aeec3e50 Merge branch '20251121-fix-1298' of http://10.251.129.121/boeu/learning-system-portal into test1024 2025-11-22 14:32:16 +08:00
joshen
15f91669f6 Merge branch '20251121-fix-1298' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251121-fix-1298 2025-11-22 14:31:12 +08:00
zxj
4c453e3974 fix:跳转登录判断是否被嵌入 2025-11-22 14:28:58 +08:00
joshen
bf2b9456e4 Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into test1024 2025-11-21 17:14:47 +08:00
joshen
cc5134d929 Merge branch '20251121-fix-1298' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251121-fix-1298 2025-11-21 10:41:43 +08:00
zxj
47dde458de fix:修复被嵌页面token过期不一致问题 2025-11-21 10:33:35 +08:00
joshen
6a46e5b438 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-20 18:18:37 +08:00
zxj
a0a5e57a13 fix:转正弹窗逻辑调整 2025-11-20 18:17:21 +08:00
dong.ai
3c0ca61106 修改标题展示 2025-11-20 15:19:35 +08:00
670788339
d57bb6e732 外部讲师的默认头像 2025-11-20 11:09:47 +08:00
670788339
36de793661 Merge branch 'PingCode-20251117' into test1024
# Conflicts:
#	src/views/study/coursenew.vue
2025-11-20 11:02:28 +08:00
670788339
6ad28a4940 外部讲师的默认头像 2025-11-20 11:00:22 +08:00
670788339
3701605f7a 标签-精品课程库 课程名称与标签间距调整 2025-11-19 17:59:40 +08:00
joshen
9262339fdc Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into test1024 2025-11-19 16:43:29 +08:00
joshen
bb4219c6f6 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-19 16:42:30 +08:00
zxj
7092c6b1a3 fix:报名接口返回解析调整 2025-11-19 16:40:57 +08:00
joshen
210351dadf Merge remote-tracking branch '121/test1024' into test1024 2025-11-19 14:56:36 +08:00
dong.ai
facab35e46 精品课修改字体样式 2025-11-19 14:55:22 +08:00
zxj
3fa36386f0 fix:必修课进度样式调整 2025-11-19 14:20:21 +08:00
joshen
7e6c6b0df9 Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into test1024 2025-11-19 14:14:38 +08:00
joshen
8d61675246 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-19 14:13:14 +08:00
zxj
6c9ae86a5b fix:学习进度接口调整 2025-11-19 14:12:20 +08:00
joshen
fc68c89dd2 Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into test1024 2025-11-19 14:06:45 +08:00
joshen
79f2b20a32 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-19 14:05:46 +08:00
zxj
34f8e026aa fix:查询学习进度接口调整 2025-11-19 14:04:20 +08:00
670788339
b021be2f6f Merge remote-tracking branch '104/master' into 104-master 2025-11-19 13:37:35 +08:00
670788339
11e34ca335 标签-课程库 课程名称与标签间距调整 2025-11-19 13:37:14 +08:00
dong.ai
d1881e82e0 精品课标题去掉图片 2025-11-19 11:25:27 +08:00
赵依梦
7c9b886ebd 解决冲突 2025-11-19 09:20:15 +08:00
joshen
a4a4f47b83 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 20:16:33 +08:00
zxj
f400218a54 fix:报名审批不通过提示词修改 2025-11-18 20:15:45 +08:00
joshen
bfed9a78db Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 20:09:15 +08:00
zxj
d307356570 fix:重新报名弹窗样式重写 2025-11-18 20:08:01 +08:00
zxj
6b5c6c2ba9 fix:学习页样式优化 2025-11-18 19:55:42 +08:00
joshen
468796295c Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 19:21:49 +08:00
zxj
133b35b51e fix:专区-社招新员工跳转逻辑调整 2025-11-18 19:20:39 +08:00
zxj
d6d27121df fix:消息提示样式调整 2025-11-18 19:00:51 +08:00
joshen
b335a9088a Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 16:14:21 +08:00
zxj
3088c8f1c8 fix:报名后直接进入学习页面 2025-11-18 16:12:59 +08:00
joshen
01e4c24927 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 15:17:44 +08:00
zxj
8808927507 fix:报名页面增加loading效果 2025-11-18 11:45:21 +08:00
joshen
6678830aaf Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-18 09:18:27 +08:00
zxj
457271395b fix:用户名称来源调整 2025-11-18 09:16:42 +08:00
joshen
bf20eced9b Merge branch 'master' into ebiz-uat-2025-11-06 2025-11-17 18:58:49 +08:00
670788339
8f2da1c736 取消processStatus setup写法 2025-11-17 18:25:29 +08:00
joshen
0db4fe7c71 Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee 2025-11-17 18:23:21 +08:00
zxj
0e80ff4df6 fix:报名失败提示语调整 2025-11-17 18:20:02 +08:00
zxj
552d29d2b7 fix:报名流程调整 2025-11-17 18:04:56 +08:00