feat:处理UI验收后的问题

e14bd165 · zhangleyuan · b73c887b · e14bd165 · e14bd165 · e14bd165
Commit e14bd165 authored Jan 22, 2021 by zhangleyuan
9 changed files
--- a/src/components/MultipleDatePicker.less
+++ b/src/components/MultipleDatePicker.less
@@ -55,7 +55,9 @@
      cursor: pointer;
      vertical-align: top;
      &:hover {
-        background: #e8e8e8;
+        background: #FFB714;
+        opacity:20%;
+        border-radius:4px;
      }
      &.before-disabled {
        color: #e8e8e8;

--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -632,4 +632,8 @@ mr0 {
 .row-dragging .drag-visible {
  visibility: visible;
+}
+.ant-select-dropdown .rc-virtual-list-scrollbar .rc-virtual-list-scrollbar-thumb{
+  background: #D6D6D6 !important;
 }
\ No newline at end of file
--- a/src/modules/course-manage/DataList/CourseData.jsx
+++ b/src/modules/course-manage/DataList/CourseData.jsx
@@ -219,7 +219,7 @@ class DataList extends React.Component {
      <Table
        columns={this.getVisiterColumns()}
        dataSource={this.state.teacherData.visitorInfoVOList}
-        scroll={{ y: 75 }}
+        scroll={{ y: 80 }}
        size={"small"}
        style={{ width: 450 }}
        pagination={false}

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -147,7 +147,7 @@ class LiveCourseList extends React.Component {
      columns = [
        {
          title: "直播课",
-          width: "25%",
+          width: "23%",
          key: "course",
          dataIndex: "courseName",
          render: (val, record) => {
@@ -261,7 +261,7 @@ class LiveCourseList extends React.Component {
            <span>店铺展示</span>
            <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
          </span>,
-          width: "7%",
+          width: "9%",
          dataIndex: "courseware",
          render: (val, item, index) => {
            return  (

--- a/src/modules/course-manage/modal/ManageCoursewareModal.less
+++ b/src/modules/course-manage/modal/ManageCoursewareModal.less
@@ -58,7 +58,7 @@
      }
      &:hover {
        .name {
-          color: #FF7519;
+          color: #FFB714;
        }
      }
    }

--- a/src/modules/course-manage/video-course/components/AddVideoIntro.jsx
+++ b/src/modules/course-manage/video-course/components/AddVideoIntro.jsx
@@ -187,17 +187,15 @@ class AddVideoIntro extends React.Component {
        <div className="allow-tourist-join">
          <span className="label">观看设置：</span>
          <div className="content">
-              <Row>
+            <div>
-                <Col span={3}>
+                <Switch checked={whetherVisitorsJoin==="YES"? true:false} onChange={this.whetherVisitorsJoinChange}/>
-                    <Switch checked={whetherVisitorsJoin==="YES"? true:false} onChange={this.whetherVisitorsJoinChange}/>
+            </div>  
-                </Col>  
+            <div>
-                <Col span={21}>
+              <div className="desc">
-                  <div className="desc">
+                <div>开启：允许未绑定手机号的用户进入直播间观看直播</div>
-                    <div>开启：允许未绑定手机号的用户进入直播间观看直播</div>
+                <div>关闭：仅限绑定了手机号的用户可以进入直播间观看直播</div>
-                    <div>关闭：仅限绑定了手机号的用户可以进入直播间观看直播</div>
+              </div>
-                  </div>
+            </div> 
-                </Col> 
-              </Row>
          </div>
        </div>
        <div className="store-show">
@@ -217,7 +215,7 @@ class AddVideoIntro extends React.Component {
          </div>
        </div>
        <div className="introduce">
-          <span className="label">视频课简介:</span>
+          <span className="label">视频课简介：</span>
          <div className="content">
                <div className="intro-list">
                  {

--- a/src/modules/course-manage/video-course/components/AddVideoIntro.less
+++ b/src/modules/course-manage/video-course/components/AddVideoIntro.less
 .add-video__intro-info {
    .playback {
      margin-bottom: 10px;
      .require {
@@ -17,10 +16,14 @@
    }
    .allow-tourist-join{
      display:flex;
+      .content{
+        display:flex;
+      }
      .desc{
        margin-left:16px;
        font-size:14px;
        color:#999;
+        display:inline-block;
      }
    }
    .store-show{
@@ -31,6 +34,7 @@
          margin-left:16px;
          font-size:14px;
          color:#999;
+          display:inline-block;
        }
    }
    .radio {

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:12:45
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-19 15:53:11
+ * @LastEditTime: 2021-01-22 16:25:06
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -68,7 +68,8 @@ class VideoCourseList extends React.Component {
        title: '视频课',
        key: 'scheduleName',
        dataIndex: 'scheduleName',
-        width:'15%',
+        width:321,
+        fixed: 'left',
        render: (val, record) => {
          const { coverUrl, scheduleVideoUrl } = record;
          return (
@@ -90,7 +91,7 @@ class VideoCourseList extends React.Component {
        title: '课程分类',
        key: 'categoryName',
        dataIndex: 'categoryName',
-        width: '10%',
+        width: '20%',
        render: (val, record) => {
          return (
            <div className="record__item">
@@ -103,7 +104,7 @@ class VideoCourseList extends React.Component {
        title: '创建人',
        key: 'createName',
        dataIndex: 'createName',
-        width: '8%',
+        width: '10%',
        render: (val) => {
          return (
              <div>
@@ -168,7 +169,8 @@ class VideoCourseList extends React.Component {
        title: '操作',
        key: 'operate',
        dataIndex: 'operate',
-        width: "20%",
+        width: 256,
+        fixed: 'right',
        render: (val, record) => {
          return (
            <div className="operate">
@@ -325,6 +327,8 @@ class VideoCourseList extends React.Component {
          columns={this.parseColumns()}
          onChange={this.handleChangeTable}
          pagination={false}
+          scroll={{ x: 1500}}
+          bordered
        />
        <div className="box-footer">

--- a/src/modules/course-manage/video-course/components/VideoCourseOpt.less
+++ b/src/modules/course-manage/video-course/components/VideoCourseOpt.less
 .video-course-opt {
-  margin-top: 16px;
  .link {
    color: #FF8534;
  }