Commit Graph

4254 Commits

Author SHA1 Message Date
zhangsir
8d7394cd7d Merge branch 'test' 2024-01-31 18:28:12 +08:00
zhangsir
74942ee4cf 522细节修改 2024-01-31 18:26:02 +08:00
zhangsir
5ebadf9196 Merge branch 'test' 2024-01-30 17:57:08 +08:00
zhangsir
b0091a9c22 修改二维码显示隐藏 2024-01-30 17:56:31 +08:00
zhangsir
cdbbf7264d Merge branch 'test' 2024-01-30 17:13:11 +08:00
zhangsir
3b3442b867 教师权重 2024-01-30 17:12:26 +08:00
zhangsir
1fc4468824 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/components/drawers/AddOpenCourse.vue
2024-01-30 14:19:37 +08:00
zhangsir
ab34f1737f 二维码积分 2024-01-30 14:13:07 +08:00
zhangsir
16c81bada8 全部签到 2024-01-30 10:18:47 +08:00
zhangsir
1552ffa0ed 教师回退,防止报错 2024-01-29 17:29:41 +08:00
zhangsir
5e324392c2 二维码积分 2024-01-29 16:52:58 +08:00
zhangsir
c04c9e91d6 修改522 2024-01-23 17:59:37 +08:00
joshen
994b4a1038 Merge branch 'zcwy0122-l' into 'master'
项目-学员-查看 中关于 status 的判断需要修改

See merge request !162
2024-01-22 16:12:29 +08:00
joshen@zcwytd.com
7e26b636ff 项目-学员-查看 中关于 status 的判断需要修改 2024-01-22 15:15:51 +08:00
joshen
bc3de06659 Merge branch 'zcwyMaster' into 'master'
修改备注

See merge request !161
2023-12-19 16:30:58 +08:00
zhangsir
411f33f831 修改备注 2023-12-19 16:07:24 +08:00
joshen
cd3715b3c1 Merge branch 'zcwyMaster' into 'master'
Zcwy master

See merge request !159
2023-11-17 16:49:58 +08:00
zhangsir
bc2f22bf6e 弹窗修改 2023-11-17 16:29:47 +08:00
zhangsir
4ce2bacefc 修改提示语 2023-11-17 09:49:21 +08:00
zhangsir
ac703ec4a4 禁用 2023-11-17 09:24:55 +08:00
zhangsir
2edf1e2ebf 禁用 2023-11-16 18:29:27 +08:00
joshen
9b16a62620 Merge branch 'zcwyMaster' into 'master'
Zcwy master

See merge request !157
2023-11-10 17:15:48 +08:00
nisen
d20c85be9f bug 2023-11-10 16:15:12 +08:00
nisen
c90dd5065e bug 2023-11-10 16:06:25 +08:00
nisen
26177dbfd1 修改错误问题 2023-11-10 15:59:59 +08:00
nisen
82da100e62 在线管理点击学员报错问题 2023-11-10 15:39:29 +08:00
joshen
ad8396b2ec Merge branch 'zcwyMaster' into 'master'
表头定宽

See merge request !152
2023-10-31 18:15:00 +08:00
zhangsir
3dc3a39840 表头定宽 2023-10-31 11:30:18 +08:00
joshen
258afcc241 Merge branch 'master_1030' into 'master'
Master 1030

See merge request !150
2023-10-30 20:19:04 +08:00
joshen
a330db9eb7 Merge branch 'zcwyMaster' into 'master_1030'
Zcwy master

See merge request !149
2023-10-30 20:03:39 +08:00
joshen
bcc89751fc Merge branch 'zcwy1026' into 'master'
修改学习路径图管理在线完成时间问题

See merge request !148
2023-10-27 13:21:30 +08:00
joshen
c7eed7d50d Merge branch 'zcwy1025' into 'master'
修改待审核课程审核和预览问题

See merge request !147
2023-10-27 13:21:16 +08:00
nisen
e4ee1cdb4a 修改学习路径图管理在线完成时间问题 2023-10-26 16:31:16 +08:00
zhangsir
83cab12239 重置搜索 2023-10-26 13:59:42 +08:00
zhangsir
f37b0060c4 课程推荐搜索修改 2023-10-25 17:59:10 +08:00
nisen
0c5c57d2d0 修改待审核课程审核和预览问题 2023-10-25 14:28:44 +08:00
zhangsir
2e497119fd 支持回车搜索 2023-10-25 10:32:32 +08:00
zhangsir
b6d28ad62e 搜索时页数改为1 2023-10-19 15:57:29 +08:00
zhangsir
20d282bb9f 推荐弹窗修改 2023-10-19 15:53:14 +08:00
zhangsir
19e05a8ebc 关键字列宽调节 2023-10-19 15:21:57 +08:00
zhangsir
23e2716342 推荐人修改 2023-10-19 15:09:01 +08:00
NiSen
30d5eea778 修改课程推荐鼠标移入展示问题 2023-10-19 11:17:56 +08:00
zhangsir
5eca9f8c3e 课程推荐 2023-10-18 20:14:58 +08:00
zhangsir
fdaa2546c1 问题修改 2023-10-16 17:38:22 +08:00
zhangsir
434ed3022f 推荐 2023-10-13 17:34:23 +08:00
zhangsir
46ee0359df 致灰 2023-10-13 10:58:37 +08:00
zhangsir
61d44a1988 致灰 2023-10-13 00:41:27 +08:00
zhangsir
c6baeddb16 致灰 2023-10-12 18:14:27 +08:00
zhangsir
657b787815 冲突 2023-10-12 17:03:18 +08:00
zhangsir
dea07b2ec0 致灰 2023-10-12 16:34:47 +08:00