Commit Graph

3373 Commits

Author SHA1 Message Date
joshen
bede5e202b Merge remote-tracking branch 'aliyun/test1024' into test1024 2025-11-11 16:18:26 +08:00
xu
7bbc3904e0 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 16:17:27 +08:00
xu
3d7ca1cc20 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。 2025-11-11 16:16:41 +08:00
joshen
3a351763ec Merge remote-tracking branch '121/test1024' into test1024 2025-11-11 16:08:51 +08:00
joshen
3e7f35117b Merge remote-tracking branch 'aliyun/test1024' into test1024 2025-11-11 16:08:35 +08:00
xu
b529695751 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 16:07:13 +08:00
xu
ebae7f6c0b 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 16:06:32 +08:00
670788339
9990d74f36 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/views/portal/course/Detail.vue
#	src/views/portal/course/Index.vue
#	src/views/portal/course/qualityCourse.vue
2025-11-11 15:46:56 +08:00
670788339
57d9f9b483 课程库标签高亮显示 2025-11-11 15:42:36 +08:00
joshen
ff7ee7dfef Merge remote-tracking branch '121/test1024' into test1024 2025-11-11 15:33:50 +08:00
joshen
0ac8396f96 Merge remote-tracking branch 'aliyun/test1024' into test1024 2025-11-11 15:33:20 +08:00
xu
16355a1e5e Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 15:30:49 +08:00
xu
91f06d4ed6 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 15:30:20 +08:00
670788339
be2bc822f4 测试 2025-11-11 15:27:38 +08:00
670788339
67147db953 日志 2025-11-11 15:11:52 +08:00
670788339
63515f53c4 Merge remote-tracking branch '121/test1024' into test1024 2025-11-11 15:01:43 +08:00
670788339
846b6132f6 日志 2025-11-11 15:00:27 +08:00
joshen
1471a4d01a Merge remote-tracking branch '121/test1024' into test1024 2025-11-11 15:00:07 +08:00
joshen
c2cff99f67 Merge remote-tracking branch 'aliyun/test1024' into test1024 2025-11-11 14:59:35 +08:00
xu
4ee084cff2 Merge branch 'refs/heads/master-20251105-xc' into test1024 2025-11-11 14:56:15 +08:00
xu
9b3b3b94ef 【bug:SZX-1155】在线课程管理列表中,增加两列:审核人和审核时间。并修改页面样式,让表格可以左右滚动显示完整。 2025-11-11 14:49:14 +08:00
670788339
b8cfe01ed9 课程标签显示 2025-11-11 14:47:36 +08:00
670788339
1710e34f89 全部选中样式 2025-11-11 14:26:57 +08:00
670788339
367c237cf4 选中样式 2025-11-11 14:22:19 +08:00
670788339
cfa7d0a9aa 选中样式 2025-11-11 14:15:01 +08:00
670788339
e292a57b20 课程详情页标签样式 2025-11-11 10:44:24 +08:00
670788339
de0ef5d501 课程详情页标签样式 2025-11-11 10:20:53 +08:00
670788339
a399bf3165 Merge branch 'master-20251023-tag' into test1024 2025-11-11 09:11:13 +08:00
670788339
88c83af460 1111修改课程库内容导航底色样式 2025-11-11 09:10:04 +08:00
670788339
5c55720546 1111修改课程库内容导航底色样式 2025-11-11 08:48:55 +08:00
670788339
79f140b4a9 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/api/modules/course.js
#	src/components/Course/courseForm.vue
#	src/views/portal/course/Index.vue
2025-11-10 19:31:18 +08:00
670788339
a78bac9368 1110修改样式 2025-11-10 19:26:10 +08:00
670788339
b0f366aa1e 1110修改样式 2025-11-10 19:14:03 +08:00
670788339
ab529e0390 1110修改样式 2025-11-10 19:03:22 +08:00
670788339
f121a2aaf9 1110修改样式 2025-11-10 19:01:19 +08:00
670788339
8228b33cb0 提示 2025-11-10 18:49:54 +08:00
670788339
351b930ab1 提示 2025-11-10 17:40:45 +08:00
670788339
1fe964157c 提示 2025-11-10 16:18:55 +08:00
670788339
8fade452e2 提示 2025-11-10 16:14:00 +08:00
670788339
f48806ca7c 还原 2025-11-10 15:57:06 +08:00
670788339
8d5aca399b 还原 2025-11-10 15:56:34 +08:00
670788339
c2fbbeeefa 还原提示 2025-11-10 15:29:21 +08:00
670788339
599370aded 提示测试 2025-11-10 15:17:33 +08:00
670788339
90c2724f7a 提示测试 2025-11-10 14:51:53 +08:00
670788339
2ab809a70f 提示测试 2025-11-10 13:16:28 +08:00
670788339
05c74df84f Merge branch 'master-20251023-tag' into test1024 2025-11-10 10:30:14 +08:00
670788339
702255d9d0 精品课标签导航调整样式 2025-11-10 10:29:56 +08:00
670788339
2890938604 Merge branch 'master-20251023-tag' into test1024
# Conflicts:
#	src/views/portal/course/qualityCourse.vue
2025-11-10 10:25:18 +08:00
670788339
df3e246d25 精品课标签导航取消加粗 2025-11-10 10:24:02 +08:00
670788339
be0763d62b 提示 2025-11-10 10:10:47 +08:00