feat:处理ui验收后的问题

93718d3b · zhangleyuan · 4d0b9420 · 93718d3b · 93718d3b · 93718d3b
Commit 93718d3b authored Dec 28, 2020 by zhangleyuan
18 changed files
--- a/src/components/Breadcrumbs.less
+++ b/src/components/Breadcrumbs.less
@@ -23,7 +23,7 @@
  .ant-breadcrumb{
    display: inline-block;
    span{
-      color: #989898;
+      color: #333;
      font-weight: 400;
    }
  }

--- a/src/components/ShowTips.less
+++ b/src/components/ShowTips.less
@@ -11,6 +11,7 @@
    color:#FF9D14;
    line-height: 24px;
    height: 20px;
+    margin-top:4px;
  }
  p {
    color:#666666;

--- a/src/modules/course-manage/AddLive.less
+++ b/src/modules/course-manage/AddLive.less
@@ -10,6 +10,7 @@
      color: #333;
      font-weight: 500;
      line-height: 22px;
+      margin-bottom:8px;
    }
    .add-live__class-info {
      margin-left: 14px;

--- a/src/modules/course-manage/DataList/CourseData.jsx
+++ b/src/modules/course-manage/DataList/CourseData.jsx
@@ -223,6 +223,7 @@ class DataList extends React.Component {
        size={"small"}
        style={{ width: 450 }}
        pagination={false}
+        className="visitor-num-table"
      />
    );
  };
@@ -309,7 +310,7 @@ class DataList extends React.Component {
          <div className="filter-wrap">
            <div className="filter">
              <Button
-                style={{ height: 32, marginLeft: 16 }}
+                style={{ height: 32}}
                onClick={_.debounce(
                  () => {
                    if (!studentData.length) {
@@ -328,6 +329,7 @@ class DataList extends React.Component {
          </div>
          <Table
+            bordered
            size="small"
            scroll={{ y: 600 }}
            columns={this.getStudentColumns()}

--- a/src/modules/course-manage/DataList/DataList.less
+++ b/src/modules/course-manage/DataList/DataList.less
@@ -59,7 +59,9 @@
 .ant-table-small > .ant-table-content .ant-table-header {
  background-color: #fafafa !important;
 }
+.visitor-num-table .ant-table-tbody > tr > td{
+  border-bottom:none !important;
+}
 .teacher-course-data {
  width: 100%;
  height: 90px;

--- a/src/modules/course-manage/DataList/PlaybackData.jsx
+++ b/src/modules/course-manage/DataList/PlaybackData.jsx
@@ -129,6 +129,7 @@ class PlaybackData extends React.Component {
        </a>
        <Button onClick={() => {this.handleplaybackExport()}}>导出</Button>
        <Table
+          bordered
          size="small"
          columns={this.getPlaybackColumns()}
          dataSource={playbackData}

--- a/src/modules/course-manage/components/AddLiveBasic.less
+++ b/src/modules/course-manage/components/AddLiveBasic.less
@@ -50,7 +50,7 @@
      .default-btn {
        margin-left: 16px;
-        color: #FFB714;
+        color: #5289FA;
        cursor: pointer;
        &.disabled {
@@ -72,8 +72,12 @@
  .course-catalog{
    margin:20px  0 0 14px;
  }
+}
+.ant-cascader-menu-item-active:not(.ant-cascader-menu-item-disabled){
+  font-weight:normal !important;
+  color:#FF9D14 !important;
 }
 #imgCutModalNew {
  width: 500px;
  height: 300px;

--- a/src/modules/course-manage/components/AddLiveClass.jsx
+++ b/src/modules/course-manage/components/AddLiveClass.jsx
@@ -154,12 +154,7 @@ class AddLiveClass extends React.Component {
                  </span>
                <div>
                  <div className='select-day'>
-                    已选 
+                    已选 <span className="mark-day">{isLongArr(calendarTime) ? calendarTime.length : 0}</span> 天
-                    <span className="mark-day">
-                      {isLongArr(calendarTime)
-                        ? calendarTime.length : 0
-                      }
-                    </span> 天
                  </div>
                  <MultipleDatePicker
                    selectDateList={calendarTime}

--- a/src/modules/course-manage/components/AddLiveClass.less
+++ b/src/modules/course-manage/components/AddLiveClass.less
@@ -185,7 +185,7 @@
      .select-day {
        margin-bottom: 4px;
        .mark-day {
-          color: #FC9C6B;
+          color: #5289FA;
        }
      }
    }

--- a/src/modules/course-manage/components/AddLiveIntro.jsx
+++ b/src/modules/course-manage/components/AddLiveIntro.jsx
@@ -246,30 +246,26 @@ class AddLiveIntro extends React.Component {
    console.log('liveCourseMediaRequests',liveCourseMediaRequests);
    return (
      <div className="add-live__intro-info">
-        <div className="playback">
+        <div className="playback" >
          <span className="label"><span className="require">*</span>直播回放：</span>
          <div className="content">
            <Radio.Group value={needRecord} onChange={(e) => { this.props.onChange('needRecord', e.target.value) }}  disabled={!isEdit ? true: false}>
              <Row style={{ marginBottom: '5px' }}>
-                <Col span={8}>
+                <Col span={24}>
                  <Radio value="YES">
                    自动录制 
+                    <span className="playback__text">系统自助进行全程直播录制</span>
                  </Radio>
                </Col>
-                <Col span={16}>
-                  <span className="playback__text">系统自助进行全程直播录制</span>
-                </Col>
              </Row>
              <Row>
                <Col span={8}>
                  <Radio value="NO">
                    手动录制
+                    <span className="playback__text">讲师手动选择何时开始录制</span>
                  </Radio>
                </Col>
-                <Col span={16}>
-                  <span className="playback__text">讲师手动选择何时开始录制</span>
-                </Col>
              </Row>
            </Radio.Group>
          </div>
@@ -277,15 +273,15 @@ class AddLiveIntro 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 class="instro-text">
-                  <div>开启：用户可直接进入直播间观看直播</div>
+                <div>开启：用户可直接进入直播间观看直播</div>
-                  <div>关闭：用户需先填写手机号并短信验证，通过后才可进入直播间观看直播</div>
+                <div>关闭：用户需先填写手机号并短信验证，通过后才可进入直播间观看直播</div>
-                </Col> 
+              </div>
-              </Row>
+            </div> 
          </div>
        </div>
        <div className="warmup">
@@ -312,7 +308,11 @@ class AddLiveIntro extends React.Component {
                  })
                }}>上传图片/视频</Button>
-                <div className="tips">建议尺寸1280*720px或16:9。图片最大5M，支持jpg、jpeg和png；视频最大500M，支持mp4。</div>
+                <div className="tips">
+                  <div>建议尺寸1280*720px或16:9。图片最大5M，支持jpg、jpeg和png；视频最大500M，</div>
+                  <div>支持mp4。</div>
+                </div>
                <Popover content={
                  <div className="example-wrap">
                    <p className="title">直播间暖场图示例</p>

--- a/src/modules/course-manage/components/AddLiveIntro.less
+++ b/src/modules/course-manage/components/AddLiveIntro.less
@@ -7,6 +7,7 @@
    }
    &__text {
      color: #999;
+      margin-left:12px;
    }
  }
@@ -14,9 +15,18 @@
  .introduce {
    display: flex;
    flex-direction: row;
+    margin-bottom:16px;
  }
  .allow-tourist-join{
    display:flex;
+    margin-bottom:16px;
+    .instro-text{
+      color:#999;
+      margin-left:12px;
+    }
+    .content{
+      display:flex;
+    }
  }
  .radio {
    display: block;
@@ -126,7 +136,7 @@
  }
  .checkExample {
    width: 60px;
-    color: #FF7519;
+    color: #5289FA;
    cursor: pointer;
  }
  .warmup {

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -340,7 +340,7 @@ class LiveCourseList extends React.Component {
    return  confirm({
      title: '你确定要删除直播课',
      content: '删除后，用户将不能观看直播课/回放',
-      icon: <QuestionCircleOutlined />,
+      icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
      okText: '删除',
      okType: 'danger',
      cancelText: '取消',

--- a/src/modules/course-manage/components/LiveCourseList.less
+++ b/src/modules/course-manage/components/LiveCourseList.less
@@ -39,32 +39,23 @@
    .teacher{
      font-size: 12px;
      color: #666666;
-      // .teacher-name{
+      max-width: 96px;
-      //   max-width:60px;
+      overflow: hidden;
-      //   display:inline-block;
+      text-overflow:ellipsis;
-      //   overflow: hidden;
+      white-space: nowrap;
-      //   text-overflow:ellipsis;
-      //   white-space: nowrap;
-      //   height:16px;
-      //   line-height:16px;
-      // }
    }
    .assistant{
      font-size: 12px;
      color: #666666;
-      // .assistant-name{
+      max-width: 96px;
-      //   max-width:60px;
+      overflow: hidden;
-      //   display:inline-block;
+      text-overflow:ellipsis;
-      //   overflow: hidden;
+      white-space: nowrap;
-      //   text-overflow:ellipsis;
-      //   white-space: nowrap;
-      //   height:16px;
-      //   line-height:16px;
-      // }
    }
    .split {
      margin: 0 4px;
      color: #BFBFBF;
+      display: inline-blcok;
    }
  }
  .categoryName{

--- a/src/modules/course-manage/modal/ClassRecordModal.jsx
+++ b/src/modules/course-manage/modal/ClassRecordModal.jsx
@@ -3,7 +3,7 @@
 * @Author: zhangyi
 * @Date: 2020-05-12 09:43:48
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-09 16:22:42
+ * @LastEditTime: 2020-12-28 15:19:18
 */
 import React, { useState, useEffect } from "react";

--- a/src/modules/course-manage/modal/ManageCoursewareModal.jsx
+++ b/src/modules/course-manage/modal/ManageCoursewareModal.jsx
@@ -323,7 +323,7 @@ class ManageCoursewareModal extends React.Component {
              onCancel={() => { }}
            >
              <span style={{
-                color: '#FF7519',
+                color: '#5289FA',
                cursor: 'pointer'
              }}>删除</span>
            </Popconfirm>

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -131,13 +131,13 @@ class ShareLiveModal extends React.Component {
        </div>
        <div className="right">
          <div className="share-poster right__item">
-            <div className="title">② 海报分享</div>
+            <div className="title">① 海报分享</div>
            <div className="sub-title">学生可通过微信识别二维码，报名观看直播</div>
            <div className="content" onClick={this.handleDownloadPoster}>下载海报</div>
          </div>
          <div className="share-url right__item">
-            <div className="title">① 链接分享</div>
+            <div className="title">② 链接分享</div>
            <div className="sub-title">学生可通过微信打开链接，报名观看直播</div>
            <div className="content">
              <div className="share-url" id="shareUrl">{shareUrl}</div>

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.less
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.less
@@ -84,7 +84,7 @@
        color: #BFBFBF;
        &.correct {
-          color: #FC9C6B;
+          color: #FFB714;
        }
      }
    }

--- a/src/modules/root/Menu.tsx
+++ b/src/modules/root/Menu.tsx
@@ -5,7 +5,9 @@ import {
 import { Menu} from 'antd';
 import { menuList } from '../../routes//config/menuList'
 import { XMContext } from '../../store/context';
+import _ from 'underscore';
 import "./Menu.less";
 const { SubMenu } = Menu;
 function Aside(props: any) {
  const {menuType} = props
@@ -34,7 +36,7 @@ function Aside(props: any) {
    window.RCHistory.push(item.link)
  }
  function onOpenChange(openKeys:any){
-    setOpenKeys(openKeys)
+    setOpenKeys(_.last(openKeys, 1))
  }
  return (
    <div