feat:外部课程相关模块提交

f1b850cb · guomingpang · 0acddad6 · f1b850cb · f1b850cb · f1b850cb
Commit f1b850cb authored May 28, 2021 by guomingpang
5 changed files
--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -6,7 +6,7 @@
 */
 @import './variables.less';
-@active-color: #ffb000;
+@active-color: #2966ff;
 // 消息提示框
 .ant-message {
@@ -259,8 +259,8 @@
    display: inline-block;
    position: absolute;
    width: 30px;
-    height: 2px;
+    height: 4px;
-    background: #ffb000 !important;
+    background: #2966ff !important;
    left: 50%;
    transform: translateX(-50%);
  }
@@ -335,14 +335,14 @@ mr0 {
  background: #f3f6fa;
  .ant-select-selected-icon {
-    color: #ffb000 !important;
+    color: #2966ff !important;
  }
 }
 .ant-select-dropdown-menu-item-selected {
  background: none;
  font-weight: 400 !important;
-  color: #ffb000;
+  color: #2966ff;
 }
 .ant-select-open .ant-select-selection {
@@ -440,7 +440,7 @@ mr0 {
 .ant-modal {
  .ant-input {
    &:focus {
-      border: 1px solid #ffb000 !important;
+      border: 1px solid #2966ff !important;
    }
  }
 }
@@ -453,8 +453,8 @@ mr0 {
  .ant-calendar-footer-extra {
    .ant-tag-blue {
      background: #fff;
-      color: #ffb000;
+      color: #2966ff;
-      border-color: #ffb000;
+      border-color: #2966ff;
    }
  }
 }
@@ -470,7 +470,7 @@ mr0 {
 }
 .ant-modal-confirm-info .ant-modal-confirm-body > .anticon {
-  color: #ffb000 !important;
+  color: #2966ff !important;
 }
 .ant-breadcrumb > span:last-child .ant-breadcrumb-separator {
@@ -498,7 +498,7 @@ mr0 {
  font-size: 22px !important;
  line-height: 22px !important;
  float: left !important;
-  color: #ffb000 !important;
+  color: #2966ff !important;
  margin-right: 16px !important;
  &.blue {
    color: #5cbaff !important;
@@ -524,7 +524,7 @@ mr0 {
    margin-right: 16px;
  }
  > .confirm-icon {
-    color: #ffb000;
+    color: #2966ff;
  }
  .ant-modal-confirm-content {
    margin-left: 38px;
@@ -591,7 +591,8 @@ mr0 {
 // }
 .ant-table-thead > tr > th {
-  font-weight: normal !important;
+  font-weight: bold !important;
+  color: #333 !important;
 }
 td.ant-table-column-sort {
  background: none;
@@ -652,12 +653,12 @@ td.ant-table-column-sort {
  border-color: @xm-color-text-select-primary !important;
  border: none !important;
  &:hover {
-    background-color: #ffb714 !important;
+    background-color: #2966ff !important;
    opacity: 0.8 !important;
  }
  &:focus,
  &:active {
-    background-color: #ffa100 !important;
+    background-color: #5c8aff !important;
  }
 }
@@ -715,11 +716,6 @@ td.ant-table-column-sort {
  box-shadow: none !important;
  border-right: 0px !important;
 }
-// .ant-input-search:focus{
-//   border-top:1px solid #FFA100 !important;
-//   border-right:1px solid #FFA100 !important;
-//   border-bottom:1px solid #FFA100 !important;
-// }
 .ant-input-search > .ant-input-group > .ant-input-group-addon:last-child .ant-input-search-button span {
  color: #bfbfbf !important;
  font-size: 12px;
@@ -762,7 +758,6 @@ td.ant-table-column-sort {
    }
  }
  .ant-modal-footer {
-    display: flex;
    padding: 10px 24px;
  }
 }

--- a/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
-/*
- * @Author: 吴文洁
- * @Date: 2020-08-05 10:11:57
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-27 15:42:08
- * @Description: 视频课-搜索模块
- * @Copyright: 杭州杰竞科技有限公司 版权所有
- */
 import React from 'react'
 import { Row, Input, Select, Tooltip, TreeSelect } from 'antd'
@@ -184,11 +175,12 @@ class VideoCourseFilter extends React.Component {
  render() {
    const { currentTabKey } = this.props
    const {
-      query: { courseName, beginTime, endTime, operatorId, shelfState, categoryId },
+      query: { courseName, beginTime, endTime, operatorId, shelfState },
      expandFilter,
      teacherList,
      teacherQuery,
      categoryList,
+      categoryId,
    } = this.state
    return (

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -162,8 +162,6 @@ class VideoCourseList extends React.Component {
          return (
            <Switch
              loading={ShelfLoading}
-              checkedChildren='ON'
-              unCheckedChildren='OFF'
              checked={item.shelfState === 'YES'}
              defaultChecked={item.shelfState}
              onClick={(checked) => {
@@ -269,6 +267,11 @@ class VideoCourseList extends React.Component {
    const { type } = this.props
    return (
      <div className='live-course-more-menu'>
+        <If condition={type !== 'internal'}>
+          <div className='operate__item' onClick={() => this.handleShowShareModal(item)}>
+            分享
+          </div>
+        </If>
        {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') && (
          <div className='operate__item' onClick={() => this.handleRelatedModalShow(item)}>
            关联培训计划

--- a/src/modules/course-manage/video-course/index.jsx
+++ b/src/modules/course-manage/video-course/index.jsx
-/*
- * @Author: 吴文洁
- * @Date: 2020-08-05 10:08:06
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-27 17:32:07
- * @Description: 云课堂-视频课入口页面
- * @Copyright: 杭州杰竞科技有限公司 版权所有
- */
 import React from 'react'
 import { Tabs } from 'antd'
 import VideoCourseFilter from './components/VideoCourseFilter'

--- a/src/modules/plan-manage/modal/relatedCourseModal.less
+++ b/src/modules/plan-manage/modal/relatedCourseModal.less
@@ -25,6 +25,9 @@
  // .ant-tabs-top .ant-tabs-ink-bar-animated:after {
  //   height: 0;
  // }
+  .ant-modal-footer {
+    display: flex;
+  }
  .link-create-course {
    color: #666666;
    font-size: 14px;