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
fb8e5736
Commit
fb8e5736
authored
Dec 24, 2020
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:处理icon不显示的问题
parent
97f90044
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
17 deletions
+18
-17
src/common/less/icon-font.less
+6
-6
src/index.html
+2
-2
src/modules/course-manage/AddLive.jsx
+2
-0
src/modules/course-manage/components/AddLiveClass.jsx
+1
-1
src/modules/course-manage/components/AddLiveIntro.jsx
+2
-2
src/modules/course-manage/components/LiveCourseList.jsx
+1
-1
src/modules/course-manage/modal/ManageCoursewareModal.jsx
+2
-2
src/modules/course-manage/modal/PreviewCourseModal.jsx
+1
-1
src/modules/root/Login.jsx
+1
-2
No files found.
src/common/less/icon-font.less
View file @
fb8e5736
@font-face {
@font-face {
font-family: 'iconfont'; /* project id 2223403 */
font-family: 'iconfont'; /* project id 2223403 */
src: url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.eot');
src: url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.eot');
src: url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.eot?#iefix') format('embedded-opentype'),
src: url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.woff2') format('woff2'),
url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.woff2') format('woff2'),
url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.woff') format('woff'),
url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.woff') format('woff'),
url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.ttf') format('truetype'),
url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.ttf') format('truetype'),
url('//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.svg#iconfont') format('svg');
url('//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.svg#iconfont') format('svg');
}
}
.iconfont{
.iconfont{
font-family:"iconfont" !important;
font-family:"iconfont" !important;
...
...
src/index.html
View file @
fb8e5736
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Author: 吴文洁
* @Date: 2020-08-24 12:20:57
* @Date: 2020-08-24 12:20:57
* @LastEditors: zhangleyuan
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-2
3 19:56:40
* @LastEditTime: 2020-12-2
4 10:34:16
* @Description:
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
* @Copyright: 杭州杰竞科技有限公司 版权所有
-->
-->
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
-->
<link
rel=
"manifest"
href=
"%PUBLIC_URL%/manifest.json"
/>
<link
rel=
"manifest"
href=
"%PUBLIC_URL%/manifest.json"
/>
<link
rel=
"stylesheet"
href=
"//at.alicdn.com/t/font_2223403_
nxm2rkk26d9
.css"
>
<link
rel=
"stylesheet"
href=
"//at.alicdn.com/t/font_2223403_
0pwkijxkqyf
.css"
>
<!--
<!--
Notice the use of %PUBLIC_URL% in the tags above.
Notice the use of %PUBLIC_URL% in the tags above.
...
...
src/modules/course-manage/AddLive.jsx
View file @
fb8e5736
...
@@ -53,6 +53,7 @@ const defaultIntroInfo = {
...
@@ -53,6 +53,7 @@ const defaultIntroInfo = {
contentType
:
"INTRO"
,
contentType
:
"INTRO"
,
mediaType
:
'TEXT'
,
mediaType
:
'TEXT'
,
mediaContent
:
''
,
mediaContent
:
''
,
key
:
Math
.
random
()
}],
}],
}
}
...
@@ -98,6 +99,7 @@ class AddLive extends React.Component {
...
@@ -98,6 +99,7 @@ class AddLive extends React.Component {
contentType
:
"INTRO"
,
contentType
:
"INTRO"
,
mediaType
:
'TEXT'
,
mediaType
:
'TEXT'
,
mediaContent
:
''
,
mediaContent
:
''
,
key
:
Math
.
random
()
}]
}]
},
},
}
}
...
...
src/modules/course-manage/components/AddLiveClass.jsx
View file @
fb8e5736
...
@@ -149,7 +149,7 @@ class AddLiveClass extends React.Component {
...
@@ -149,7 +149,7 @@ class AddLiveClass extends React.Component {
<
Tooltip
<
Tooltip
overlayStyle=
{
{
maxWidth
:
300
,
zIndex
:
'9999'
}
}
overlayStyle=
{
{
maxWidth
:
300
,
zIndex
:
'9999'
}
}
title=
{
<
div
style=
{
{
width
:
'266px'
}
}
>
支持按上课日期批量创建直播课,创建后按“课程名称_日期”命名,例如:
<
br
/>
张三的语文课_9月18日
<
br
/>
张三的语文课_9月19日......
</
div
>
}
>
title=
{
<
div
style=
{
{
width
:
'266px'
}
}
>
支持按上课日期批量创建直播课,创建后按“课程名称_日期”命名,例如:
<
br
/>
张三的语文课_9月18日
<
br
/>
张三的语文课_9月19日......
</
div
>
}
>
<
span
className=
"iconfont"
>
æ
f2
;
</
span
>
<
span
className=
"iconfont"
>
æ
1d
;
</
span
>
</
Tooltip
>
:
</
Tooltip
>
:
</
span
>
</
span
>
<
div
>
<
div
>
...
...
src/modules/course-manage/components/AddLiveIntro.jsx
View file @
fb8e5736
...
@@ -159,7 +159,7 @@ class AddLiveIntro extends React.Component {
...
@@ -159,7 +159,7 @@ class AddLiveIntro extends React.Component {
contentType
:
"INTRO"
,
contentType
:
"INTRO"
,
mediaType
:
'TEXT'
,
mediaType
:
'TEXT'
,
mediaContent
:
''
,
mediaContent
:
''
,
key
:
window
.
random_string
(
16
)
key
:
Math
.
random
(
)
});
});
this
.
props
.
onChange
(
'liveCourseMediaRequests'
,
liveCourseMediaRequests
);
this
.
props
.
onChange
(
'liveCourseMediaRequests'
,
liveCourseMediaRequests
);
...
@@ -332,7 +332,7 @@ class AddLiveIntro extends React.Component {
...
@@ -332,7 +332,7 @@ class AddLiveIntro extends React.Component {
liveCourseMediaRequests
.
map
((
item
,
index
)
=>
{
liveCourseMediaRequests
.
map
((
item
,
index
)
=>
{
if
(
item
.
mediaType
===
'TEXT'
)
{
if
(
item
.
mediaType
===
'TEXT'
)
{
return
(
return
(
<
div
className=
"intro-list__item"
key=
{
i
ndex
}
>
<
div
className=
"intro-list__item"
key=
{
i
tem
.
key
}
>
<
EditorBox
<
EditorBox
detail=
{
{
detail=
{
{
content
:
item
.
mediaContent
content
:
item
.
mediaContent
...
...
src/modules/course-manage/components/LiveCourseList.jsx
View file @
fb8e5736
...
@@ -296,7 +296,7 @@ class LiveCourseList extends React.Component {
...
@@ -296,7 +296,7 @@ class LiveCourseList extends React.Component {
<
span
className=
"operate-text"
>
更多
</
span
>
<
span
className=
"operate-text"
>
更多
</
span
>
<
span
<
span
className=
"iconfont icon"
className=
"iconfont icon"
style=
{
{
color
:
"#
FC9C6B
"
}
}
style=
{
{
color
:
"#
5289FA
"
}
}
>
>


</
span
>
</
span
>
...
...
src/modules/course-manage/modal/ManageCoursewareModal.jsx
View file @
fb8e5736
...
@@ -125,7 +125,7 @@ class ManageCoursewareModal extends React.Component {
...
@@ -125,7 +125,7 @@ class ManageCoursewareModal extends React.Component {
// 判断是否早于开课前45分钟
// 判断是否早于开课前45分钟
const
{
startTime
}
=
this
.
props
.
data
;
const
{
startTime
}
=
this
.
props
.
data
;
const
currentTime
=
new
Date
().
getTime
();
const
currentTime
=
new
Date
().
getTime
();
if
(
currentTime
>=
startTime
-
45
*
60
*
1000
)
{
if
(
currentTime
>=
startTime
-
30
*
60
*
1000
)
{
Modal
.
info
({
Modal
.
info
({
title
:
"不能再上传课件了"
,
title
:
"不能再上传课件了"
,
icon
:
(
icon
:
(
...
@@ -136,7 +136,7 @@ class ManageCoursewareModal extends React.Component {
...
@@ -136,7 +136,7 @@ class ManageCoursewareModal extends React.Component {


</
span
>
</
span
>
),
),
content
:
"请在开课前
45
分钟前上传课件,开课后可在客户端中进行上传。"
,
content
:
"请在开课前
30
分钟前上传课件,开课后可在客户端中进行上传。"
,
okText
:
'我知道了'
okText
:
'我知道了'
});
});
return
;
return
;
...
...
src/modules/course-manage/modal/PreviewCourseModal.jsx
View file @
fb8e5736
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Author: 吴文洁
* @Date: 2020-07-23 14:54:16
* @Date: 2020-07-23 14:54:16
* @LastEditors: zhangleyuan
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-2
3 14:05:00
* @LastEditTime: 2020-12-2
4 10:23:44
* @Description: 大班直播课预览弹窗
* @Description: 大班直播课预览弹窗
* @Copyright: 杭州杰竞科技有限公司 版权所有
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
*/
...
...
src/modules/root/Login.jsx
View file @
fb8e5736
...
@@ -102,8 +102,7 @@ function Login(props) {
...
@@ -102,8 +102,7 @@ function Login(props) {
User
.
setUserId
(
res
.
result
.
userId
);
User
.
setUserId
(
res
.
result
.
userId
);
User
.
setToken
(
res
.
result
.
xmToken
);
User
.
setToken
(
res
.
result
.
xmToken
);
window
.
RCHistory
.
push
({
window
.
RCHistory
.
push
({
pathname
:
`/personal-info`
,
pathname
:
`/resource-disk`
,
})
})
}
}
})
})
...
...
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