Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
7e5808ef
Commit
7e5808ef
authored
Jul 14, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Plain Diff
feat:解决合并代码后的冲突
parents
ef2780cf
8b0bf439
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
src/modules/course-manage/modal/PreviewCourseModal.jsx
+2
-7
src/modules/home/Home.jsx
+0
-1
No files found.
src/modules/course-manage/modal/PreviewCourseModal.jsx
View file @
7e5808ef
...
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-07-23 14:54:16
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-14 1
1:43:49
* @LastEditTime: 2021-07-14 1
8:19:22
* @Description: 大班直播课预览弹窗
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -166,12 +166,7 @@ class PreviewCourseModal extends React.Component {
<
div
className=
'container__header'
>
<
Choose
>
<
When
condition=
{
type
===
'videoCourse'
}
>
<
video
controls
src=
{
courseChapterList
.
length
&&
courseChapterList
[
0
].
mediaUrl
||
scheduleVideoUrl
}
poster=
{
coverUrl
?
coverUrl
:
`https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png`
}
className=
'course-url'
/>
<
img
src=
{
coverUrl
?
coverUrl
:
`https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png`
}
className=
'course-cover'
alt=
''
/>
</
When
>
<
Otherwise
>
<
img
src=
{
coverUrl
}
className=
'course-cover'
alt=
''
/>
...
...
src/modules/home/Home.jsx
View file @
7e5808ef
...
...
@@ -23,7 +23,6 @@ import User from '@/common/js/user';
import
HomeTip
from
'./HomeTip'
;
import
'./Home.less'
;
import
HomeTip
from
'./HomeTip'
;
const
Option
=
Select
.
Option
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment