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
61c991d4
Commit
61c991d4
authored
Dec 28, 2020
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:处理选择同一张图片不被触发的问题
parent
d1d25fc5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
14 deletions
+43
-14
src/modules/course-manage/components/LiveCourseFilter.jsx
+2
-2
src/modules/course-manage/components/LiveCourseFilter.less
+6
-0
src/modules/course-manage/components/LiveCourseList.jsx
+9
-8
src/modules/course-manage/components/LiveCourseList.less
+23
-2
src/modules/course-manage/modal/PreviewCourseModal.jsx
+1
-1
src/modules/personalInfo/index.tsx
+2
-1
No files found.
src/modules/course-manage/components/LiveCourseFilter.jsx
View file @
61c991d4
...
...
@@ -178,7 +178,7 @@ class LiveCourseFilter extends React.Component {
<
span
>
讲师:
</
span
>
<
Select
placeholder=
"请选择讲师"
style=
{
{
width
:
240
,
marginTop
:
6
}
}
style=
{
{
width
:
240
}
}
showSearch
allowClear
filterOption=
{
(
input
,
option
)
=>
option
}
...
...
@@ -214,7 +214,7 @@ class LiveCourseFilter extends React.Component {
value=
{
courseState
}
onChange=
{
(
value
)
=>
{
this
.
handleChangeQuery
(
'courseState'
,
value
)
}
}
>
<
Option
value=
"UN_START"
>
待
上
课
</
Option
>
<
Option
value=
"UN_START"
>
待
开
课
</
Option
>
<
Option
value=
"STARTING"
>
上课中
</
Option
>
<
Option
value=
"FINISH"
>
已完成
</
Option
>
<
Option
value=
"EXPIRED"
>
未成功开课
</
Option
>
...
...
src/modules/course-manage/components/LiveCourseFilter.less
View file @
61c991d4
...
...
@@ -11,6 +11,12 @@
width: 30%;
margin-right: 3%;
margin-bottom: 12px;
.search-name{
vertical-align: middle;
display:inline-block;
height:32px;
line-height:32px;
}
}
}
.reset-fold-area {
...
...
src/modules/course-manage/components/LiveCourseList.jsx
View file @
61c991d4
...
...
@@ -37,7 +37,7 @@ const { confirm } = Modal;
const
courseStateShow
=
{
UN_START
:
{
code
:
1
,
title
:
"待
上
课"
,
title
:
"待
开
课"
,
color
:
"#FDBE31"
,
},
STARTING
:
{
...
...
@@ -48,12 +48,12 @@ const courseStateShow = {
FINISH
:
{
code
:
3
,
title
:
"已完成"
,
color
:
"#
2FC83C
"
,
color
:
"#
3BBDAA
"
,
},
EXPIRED
:
{
code
:
4
,
title
:
"未成功开课"
,
color
:
"#
CCCCCC
"
,
color
:
"#
999
"
,
},
};
class
LiveCourseList
extends
React
.
Component
{
...
...
@@ -180,10 +180,11 @@ class LiveCourseList extends React.Component {
<>
<
span
className=
"split"
>
|
</
span
>
<
span
className=
"assistant"
>
助教:
{
record
.
admins
.
map
((
item
,
index
)
=>
{
return
<
span
>
{
item
.
adminName
}
{
(
index
<
record
.
admins
.
length
-
1
)
&&
(<
span
>
、
</
span
>)
}
</
span
>
})
}
{
record
.
admins
.
map
((
item
,
index
)
=>
{
return
<
span
>
{
item
.
adminName
}
{
(
index
<
record
.
admins
.
length
-
1
)
&&
(<
span
>
、
</
span
>)
}
</
span
>
})
}
</
span
>
</>
}
...
...
@@ -217,7 +218,7 @@ class LiveCourseList extends React.Component {
editData
:
item
,
openCoursewareModal
:
true
,
});
}
}
>
{
item
.
courseDocumentCount
}
</
span
>
}
}
>
{
item
.
courseDocumentCount
}
个
</
span
>
);
},
},
...
...
src/modules/course-manage/components/LiveCourseList.less
View file @
61c991d4
...
...
@@ -17,6 +17,10 @@
color: #333333;
line-height: 20px;
font-weight: bold;
max-width:238px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.course-time{
font-size: 12px;
...
...
@@ -35,12 +39,28 @@
.teacher{
font-size: 12px;
color: #666666;
line-height: 20px;
// .teacher-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
}
.assistant{
font-size: 12px;
color: #666666;
line-height: 20px;
// .assistant-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
}
.split {
margin: 0 4px;
...
...
@@ -56,6 +76,7 @@
font-size: 14px;
color: #5289FA;
line-height: 20px;
text-align:right;
}
.quota-icon{
color:#5289FA;
...
...
src/modules/course-manage/modal/PreviewCourseModal.jsx
View file @
61c991d4
...
...
@@ -14,7 +14,7 @@ import './PreviewCourseModal.less';
const
courseStateShow
=
{
UN_START
:
{
title
:
"待
上
课"
,
title
:
"待
开
课"
,
},
STARTING
:
{
title
:
"上课中"
,
...
...
src/modules/personalInfo/index.tsx
View file @
61c991d4
...
...
@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-2
2 15:29:2
2
* @LastEditTime: 2020-12-2
8 14:27:0
2
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -113,6 +113,7 @@ function PersonalInfoPage() {
<
input
type=
"file"
accept=
"image/*"
value=
{
''
}
id=
"CrpperAvatarPic"
style=
{
{
display
:
'none'
}
}
onChange=
{
_handleUpdateAvatar
}
/>
...
...
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