Commit Graph

234 Commits

Author SHA1 Message Date
daihh
fecb0bb10e Merge branch 'dev' 2022-06-14 19:59:29 +08:00
lmj
2688ca6b20 从系统选择封面 2022-06-14 19:28:24 +08:00
daihh
66d94ab1b5 合并后提交 2022-06-13 20:03:02 +08:00
lmj
0afd998cd0 修改 2022-06-13 17:53:16 +08:00
zhaofang
185101f873 提交 2022-06-09 12:19:24 +08:00
zhaofang
7a62d6df51 我的收藏接口替换 2022-06-09 12:08:16 +08:00
zhaofang
0a864937dd 分享给我的跳转 2022-06-08 19:27:30 +08:00
zhaofang
5af833cc10 Merge branch 'case' into dev
# Conflicts:
#	.env.development
#	.gitignore
#	src/components/Course/weikeContent.vue
#	src/components/PdfPreview/view.vue
#	src/views/portal/case/Detail.vue
#	src/views/portal/case/Index.vue
2022-06-07 19:03:18 +08:00
86182
12b65316e4 Merge remote-tracking branch 'origin/bjy' into case
# Conflicts:
#	src/components/Course/collectItem.vue
#	src/components/Course/weikeContent.vue
2022-06-07 16:22:47 +08:00
daihh
0607d7a2ed 变更替换 2022-06-03 11:32:51 +08:00
daihh
48e0fa4060 Merge branch 'dev'
# Conflicts:
#	src/components/Course/auditCourse2.vue
2022-06-03 11:23:58 +08:00
daihh
079631d13f 修改提示问题 2022-06-02 21:26:41 +08:00
daihh
18d56695cf 提交为了发布 2022-06-02 17:45:56 +08:00
daihh
6837b3f583 提交我的修改 2022-06-02 17:24:00 +08:00
zhaofang
83c7394f61 pdf 2022-06-02 16:37:13 +08:00
daihh
52f79733b1 提交修改 2022-06-02 16:20:52 +08:00
daihh
a56370314f Merge branch 'dev' 2022-06-02 14:44:32 +08:00
daihh
263a8eabf1 提交课程制作的修改 2022-06-02 14:39:47 +08:00
zhaofang
ef55032c44 新建无目录课程时,勾选框应该和提交按钮同时出现; 2022-06-02 12:26:48 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
3b60dea485 Merge branch 'teacher' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev
# Conflicts:
#	.gitignore
#	src/components/Course/weikeContent.vue
2022-06-02 11:47:59 +08:00
daihh
b75b7f814e 提交修改 2022-06-02 11:20:11 +08:00
daihh
bdc304a49e 先提交一下 2022-06-02 10:27:33 +08:00
daihh
9ab5d6c21e 提交修改 2022-06-01 19:50:43 +08:00
daihh
c474ffca71 教师接口 2022-06-01 17:05:28 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
8d4a65d1b2 提交 2022-06-01 17:04:47 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
08d2a1aa22 pdf提示 2022-06-01 16:28:39 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
7962e4e5ad 提交 2022-06-01 15:55:14 +08:00
daihh
4ff5fbc390 Merge branch 'dev' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal 2022-05-31 19:02:14 +08:00
lmj
9c3f596d51 教师 2022-05-31 18:57:03 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
945e7de0b3 提交 2022-05-31 18:41:22 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
119ad56340 首页没有相关内容修改 2022-05-31 12:24:18 +08:00
LAPTOP-S9RBPPM6\bjxask-2201
64df676292 我的收藏样式 2022-05-31 11:36:55 +08:00
daihh
b749df42e6 提交修改 2022-05-30 23:25:01 +08:00
daihh
b050613020 2022年5月29日从svn移到git 2022-05-29 18:56:34 +08:00