Skip to content

X
xiaomai-cloud-class-web
Commit 5603cf60 by wufan
Options

style:UI验收2样式调整

parent 07276b70
Showing with 28 additions and 23 deletions
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -32,7 +32,7 @@ const courseStateShow = { ...@@ -32,7 +32,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#2966FF", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
......
src/modules/course-manage/offline-course/AddOfflineCourse.less
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
.select-day { .select-day {
margin-bottom: 4px; margin-bottom: 4px;
.mark-day { .mark-day {
color: #FFB714; color: #2966FF;
} }
} }
} }
......
src/modules/knowledge-base/components/Classification.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:05:23 * @Date: 2021-03-19 18:05:23
* @LastEditors: yuananting * @LastEditors: wufan
* @LastEditTime: 2021-04-15 21:46:41 * @LastEditTime: 2021-05-30 10:23:08
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -193,7 +193,6 @@ class Classification extends Component { ...@@ -193,7 +193,6 @@ class Classification extends Component {
className="sider-search" className="sider-search"
placeholder="搜索名称分类" placeholder="搜索名称分类"
onSearch={(value) => { onSearch={(value) => {
// TODO 调用查询分类接口
this.queryCategoryTree(value); this.queryCategoryTree(value);
}} }}
enterButton={<span className="icon iconfont">&#xe832;</span>} enterButton={<span className="icon iconfont">&#xe832;</span>}
......
src/modules/knowledge-base/components/Classification.less
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:16:58 * @Date: 2021-03-19 18:16:58
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-05-28 15:14:09 * @LastEditTime: 2021-05-30 10:19:47
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
} }
.sider-tree { .sider-tree {
width: 266px; width: 244px;
overflow: scroll; overflow: scroll;
height: ~'calc(100vh - 300px)'; height: ~'calc(100vh - 300px)';
.empty-tree-tip { .empty-tree-tip {
......
src/modules/knowledge-base/index.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 10:43:10 * @Date: 2021-03-12 10:43:10
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-04-10 16:39:30 * @LastEditTime: 2021-05-30 10:24:50
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
import React from "react"; import React from "react";
...@@ -97,7 +97,7 @@ export default class KnowledgeBase extends React.Component { ...@@ -97,7 +97,7 @@ export default class KnowledgeBase extends React.Component {
className="liner" className="liner"
style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }} style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }}
></div> ></div>
<div className="right" style={{ width: "calc(100% - 285px)" }}> <div className="right" style={{ width: "calc(100% - 265px)" }}>
<KnowledgeBaseFilter onChange={this.handleFetchScheduleList} /> <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
{/* 操作模块 */} {/* 操作模块 */}
......
src/modules/knowledge-base/modal/AddCourse.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 09:54:26 * @Date: 2021-03-13 09:54:26
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-04-07 11:56:10 * @LastEditTime: 2021-05-30 10:44:49
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -37,7 +37,7 @@ const courseStateShow = { ...@@ -37,7 +37,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#2966FF", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -256,6 +256,7 @@ class AddCourse extends React.Component { ...@@ -256,6 +256,7 @@ class AddCourse extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
...@@ -359,6 +360,7 @@ class AddCourse extends React.Component { ...@@ -359,6 +360,7 @@ class AddCourse extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
...@@ -434,6 +436,7 @@ class AddCourse extends React.Component { ...@@ -434,6 +436,7 @@ class AddCourse extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
......
src/modules/knowledge-base/modal/LiveList.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 14:38:49 * @Date: 2021-03-13 14:38:49
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-03-16 15:20:51 * @LastEditTime: 2021-05-30 10:08:02
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -22,7 +22,7 @@ const courseStateShow = { ...@@ -22,7 +22,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#2966FF", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -107,6 +107,7 @@ class LiveList extends React.Component { ...@@ -107,6 +107,7 @@ class LiveList extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
......
src/modules/knowledge-base/modal/VideoList.jsx
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 11:48:24 * @Date: 2021-03-13 11:48:24
* @LastEditors: zangsuyun * @LastEditors: wufan
* @LastEditTime: 2021-04-01 11:58:46 * @LastEditTime: 2021-05-30 10:08:09
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -105,6 +105,7 @@ class VideoList extends React.Component { ...@@ -105,6 +105,7 @@ class VideoList extends React.Component {
cursor: "pointer", cursor: "pointer",
color: "#bfbfbf", color: "#bfbfbf",
fontSize: "14px", fontSize: "14px",
fontWeight:"400"
}} }}
> >
&#xe61d; &#xe61d;
......
src/modules/plan-manage/modal/relatedCourseModal.jsx
...@@ -15,7 +15,7 @@ const courseStateShow = { ...@@ -15,7 +15,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待开课", title: "待开课",
color: "#2966FF", color: "#FFB129",
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -232,7 +232,8 @@ class SelectOperatorModal extends React.Component { ...@@ -232,7 +232,8 @@ class SelectOperatorModal extends React.Component {
parseLiveColumns = () => { parseLiveColumns = () => {
const columns = [ const columns = [
{ {
title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip></span>, title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:"400"
}}>&#xe61d;</i></Tooltip></span>,
key: 'course', key: 'course',
dataIndex: 'course', dataIndex: 'course',
width:'40%', width:'40%',
...@@ -299,7 +300,7 @@ class SelectOperatorModal extends React.Component { ...@@ -299,7 +300,7 @@ class SelectOperatorModal extends React.Component {
parseVideoColumns = () => { parseVideoColumns = () => {
const columns = [ const columns = [
{ {
title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip></span>, title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:"400"}}>&#xe61d;</i></Tooltip></span>,
key: 'course', key: 'course',
dataIndex: 'course', dataIndex: 'course',
width:'60%', width:'60%',
...@@ -351,7 +352,7 @@ class SelectOperatorModal extends React.Component { ...@@ -351,7 +352,7 @@ class SelectOperatorModal extends React.Component {
parsePictureColumns = () => { parsePictureColumns = () => {
const columns = [ const columns = [
{ {
title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip></span>, title: <span><span>课程信息</span><Tooltip title="仅显示未关联课程，已关联课程不支持重复选择"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:"400"}}>&#xe61d;</i></Tooltip></span>,
key: 'course', key: 'course',
dataIndex: 'course', dataIndex: 'course',
width:'55%', width:'55%',
......
src/modules/teach-tool/components/CourseCategorySiderTree.less
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
} }
.sider-tree { .sider-tree {
width: 240px; width: 244px;
overflow: scroll; overflow: scroll;
height: calc(100vh - 300px); height: calc(100vh - 300px);
.empty-tree-tip { .empty-tree-tip {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment