Commits · 030ce89c902882d8156ee15f18d0bf5a825da64e · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

14 Jul, 2021 21 commits
- Merge branch 'dev' of… · 030ce89c
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/index.html
#	src/index.tsx
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/components/LiveCourseOpt.jsx
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/home/Home.jsx
#	src/modules/root/Header.jsx
#	src/modules/root/Login.jsx
#	src/modules/root/Menu.tsx
#	src/modules/teach-tool/examination-manager/AddExam.tsx
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 14, 2021
  030ce89c Browse Files
- Merge branch 'feature/zhangleyuan/20210706/format-expand-course' into dev · f89f975e
  yuananting committed Jul 14, 2021
  
  f89f975e Browse Files
- fix:保存线上课上传课节提示文案修改 · 54257b2f
  yuananting committed Jul 14, 2021
  
  54257b2f Browse Files
- Merge branch 'feature/zhangleyuan/20210706/format-expand-course' into dev · 4bcfe840
  yuananting committed Jul 14, 2021
  
  4bcfe840 Browse Files
- fix:培训计划学习详情弹窗课节序号修改 · 04920b78
  yuananting committed Jul 14, 2021
  
  04920b78 Browse Files
- Merge branch 'feature/zhangleyuan/20210706/format-expand-course' into dev · 5c32cca5
  yuananting committed Jul 14, 2021
  
  5c32cca5 Browse Files
- fix:线上课上传文件大小超出限制提示文案修改 · aff6605e
  yuananting committed Jul 14, 2021
  
  aff6605e Browse Files
- style:菜单栏优化 · 1ecc2de1
  wufan committed Jul 14, 2021
  
  1ecc2de1 Browse Files
- Merge branch 'dev' of… · 09ba60c9
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  wufan committed Jul 14, 2021
  09ba60c9 Browse Files
- Merge branch 'feature/wufan/20210713/refactore-placeholder' into dev · 3f903deb
  wufan committed Jul 14, 2021
  
  3f903deb Browse Files
- style:菜单栏样式优化 · 716aae90
  wufan committed Jul 14, 2021
  
  716aae90 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 56fe0ead
  yuananting committed Jul 14, 2021
  
  56fe0ead Browse Files
- fix:线上课学习详情弹窗序号调整 · bfb8d3c0
  yuananting committed Jul 14, 2021
  
  bfb8d3c0 Browse Files
- feat:处理重命名 · 5ae2e61a
  zhangleyuan committed Jul 14, 2021
  
  5ae2e61a Browse Files
- feat:处理线上课预览 · f252263a
  zhangleyuan committed Jul 14, 2021
  
  f252263a Browse Files
- docx:去除多余打印信息 · 82231c41
  yuananting committed Jul 14, 2021
  
  82231c41 Browse Files
- merge · d33bb7e2
  zhujian committed Jul 14, 2021
  
  d33bb7e2 Browse Files
- fix · 5b5c23ae
  zhujian committed Jul 14, 2021
  
  5b5c23ae Browse Files
- fix:调试504文案校验 · 272f23a4
  yuananting committed Jul 14, 2021
  
  272f23a4 Browse Files
- feat:解决合并代码后的问题 · dd07b40b
  zhangleyuan committed Jul 14, 2021
  
  dd07b40b Browse Files
- feat:处理创建线上课报错的问题 · 2e908029
  zhangleyuan committed Jul 14, 2021
  
  2e908029 Browse Files
13 Jul, 2021 19 commits
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · eb17cab5
  yuananting committed Jul 13, 2021
  
  eb17cab5 Browse Files
- fix:视频预览前3秒时间轴样式错误修复 · 849e1607
  yuananting committed Jul 13, 2021
  
  849e1607 Browse Files
- Merge branch 'feature/wufan/20210713/refactore-placeholder' into dev · 0e000c43
  wufan committed Jul 13, 2021
  
  0e000c43 Browse Files
- feat:分类管理placeholder文案更换 · 3347bc7d
  wufan committed Jul 13, 2021
  
  3347bc7d Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 0986ed10
  yuananting committed Jul 13, 2021
  
  0986ed10 Browse Files
- fix:培训计划关联课程底部文案调整 · f64ad7ac
  yuananting committed Jul 13, 2021
  
  f64ad7ac Browse Files
- Merge branch 'feature/yuananting/20210712/exam-optimize' into dev · ffcc5285
  yuananting committed Jul 13, 2021
  
  ffcc5285 Browse Files
- fix:关联项字段错误 · 5ab744eb
  yuananting committed Jul 13, 2021
  
  5ab744eb Browse Files
- Merge branch 'feature/zhangleyuan/20210706/format-expand-course' into dev · b2f1b816
  zhangleyuan committed Jul 13, 2021
  
  b2f1b816 Browse Files
- feat:处理视频课预览 · fae21114
  zhangleyuan committed Jul 13, 2021
  
  fae21114 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 22d6db0d
  wufan committed Jul 13, 2021
  
  22d6db0d Browse Files
- style:课程详情名称样式优化 · aa0de9b1
  wufan committed Jul 13, 2021
  
  aa0de9b1 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 499d7b14
  wufan committed Jul 13, 2021
  
  499d7b14 Browse Files
- style:课节名字长度优化 · 6b057337
  wufan committed Jul 13, 2021
  
  6b057337 Browse Files
- style:全局tablist 中的switch使用small尺寸 · d9ac3788
  guomingpang committed Jul 13, 2021
  
  d9ac3788 Browse Files
- Merge branch 'dev' of… · 2b36c514
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 13, 2021
  2b36c514 Browse Files
- Merge branch 'feature/wufan/20210713/refactore-placeholder' into dev · d5f93ecd
  wufan committed Jul 13, 2021
  
  d5f93ecd Browse Files
- style:菜单栏颜色优化 · 119f9539
  wufan committed Jul 13, 2021
  
  119f9539 Browse Files
- Merge branch 'dev' of… · 07d95621
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 13, 2021
  07d95621 Browse Files