style:UI样式优化

f081c887 · zhangleyuan · 51f670df · f081c887 · f081c887 · f081c887
Commit f081c887 authored Feb 02, 2021 by zhangleyuan
58 changed files
--- a/src/bu-components/ChooseMembersModal.jsx
+++ b/src/bu-components/ChooseMembersModal.jsx
@@ -277,6 +277,7 @@ class ChooseMembersModal extends React.Component {
          title={title}
          width={680}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        >
          <div className='choose-container'>
            {/* 拥有文件夹权限的成员列表 */}

--- a/src/bu-components/CopyFileModal.jsx
+++ b/src/bu-components/CopyFileModal.jsx
@@ -250,6 +250,7 @@ class CopyFileModal extends React.Component {
            复制到此目录
          </Button>
        ]}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
      <div className='copy-body'>
        {/* 面包屑 */}

--- a/src/bu-components/ManagingMembersModal.jsx
+++ b/src/bu-components/ManagingMembersModal.jsx
@@ -297,6 +297,7 @@ class ManagingMembersModal extends React.Component {
            title={title} 
            width={680}
            maskClosable={false}
+            closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          >
            <div className='managing-header'>
              <div className='managing-left'>

--- a/src/bu-components/NonCompliantFileModal.jsx
+++ b/src/bu-components/NonCompliantFileModal.jsx
@@ -32,6 +32,7 @@ class NonCompliantFileModal extends React.Component {
        onOk={this.props.onOk}
        maskClosable={false}
        className="prepare-lesson__non-compliant-file-modal"
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <div className="file-list">
          <div className="file-list__title">以下文件超出上传限制，无法上传，点击继续上传不会上传以下文件。</div>

--- a/src/bu-components/PreviewCourseModal.jsx
+++ b/src/bu-components/PreviewCourseModal.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-07-23 14:54:16
- * @LastEditors: wufan
- * @LastEditTime: 2020-12-22 20:29:39
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-02-01 13:58:31
 * @Description: 大班直播课预览弹窗
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */ 
@@ -82,6 +82,7 @@ class PreviewCourseModal extends React.Component {
        footer={null}
        maskClosable={false}
        className="preview-live-course-modal"
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <div className="container__wrap">
          <div className="container">

--- a/src/bu-components/SelectPrepareFileModal.jsx
+++ b/src/bu-components/SelectPrepareFileModal.jsx
@@ -525,6 +525,7 @@ class SelectPrepareFileModal extends React.Component {
        width={680}
        onCancel={this.handleClose}
        className="select-prepare-file-modal"
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        {
          // 机构可见磁盘大于1且在选择文件的情况下才显示tabs
@@ -568,12 +569,12 @@ class SelectPrepareFileModal extends React.Component {
        </div>
        <Choose>
          <When condition={!_.isEmpty(folderList)}>
-            <div
+            <div>
+              <div className="file-list"  
              onScrollCapture={() => this.handleScrollEvent()}
              style={{ height: '320px', overflowY: 'scroll' }}
              ref="fileListRef"
              >
-              <div className="file-list">
                {
                  folderList.map((folder, index) => {
                    const { folderType, folderSize, folderFormat, folderName } = folder;

--- a/src/bu-components/ShareLiveModal.jsx
+++ b/src/bu-components/ShareLiveModal.jsx
@@ -109,6 +109,7 @@ class ShareLiveModal extends React.Component {
        maskClosable={false}
        className="share-live-modal"
        onCancel={this.props.close}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <div className="left" id="poster">
        

--- a/src/components/CropperModal.tsx
+++ b/src/components/CropperModal.tsx
@@ -111,7 +111,9 @@ const CropperModal = (props: CropperModalProps) => {
          确定
          </Button>,
      ]}
-      onCancel={close}>
+      onCancel={close}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
+      >
      <Row>
        <Col span={14}>
          <div className="container">

--- a/src/components/DownloadLiveModal.jsx
+++ b/src/components/DownloadLiveModal.jsx
@@ -25,6 +25,7 @@ class DownloadLiveModal extends React.Component {
      onCancel={() => {
        this.props.onCancel();
      }}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
    >
     <img  className="download-image" src={image} alt="" />
      <p className="download-tip">{tip}</p>

--- a/src/components/ImgCutModal.jsx
+++ b/src/components/ImgCutModal.jsx
@@ -117,6 +117,7 @@ class ImgCutModal extends React.Component {
        visible={visible}
        onCancel={onClose}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        footer={[
          <Choose>
            <When condition={!needReUpload}>

--- a/src/components/ImgCutModalNew.jsx
+++ b/src/components/ImgCutModalNew.jsx
@@ -147,6 +147,7 @@ class ImgCutModalNew extends React.Component {
        visible={visible}
        onCancel={onClose}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        footer={[
          !needReUpload ?
            <Button

--- a/src/components/MultipleDatePicker.less
+++ b/src/components/MultipleDatePicker.less
@@ -55,8 +55,7 @@
      cursor: pointer;
      vertical-align: top;
      &:hover {
-        background: #FFB714;
-        opacity:0.2;
+        background:rgba(255, 183, 20, 0.2);
        border-radius:4px;
      }
      &.before-disabled {

--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -610,14 +610,7 @@ mr0 {



-//按钮的颜色的公共处理
-.ant-btn-danger:hover,
-.ant-btn-danger:focus {
-  color: #fff !important;
-  background-color: #ffb000 !important;
-  border-color: #ffb000 !important;
-}
-
+//按钮的样式的公共处理
 .ant-btn-loading {
  padding-left:18px !important;
 }
@@ -626,16 +619,7 @@ mr0 {
 .ant-btn {
  border-color: @xm-color-border;
 }
-.ant-btn-dangerous{
-  background:#FF4F4F !important;
-  color:#FFF !important;
-  border:none !important;
-}
-.ant-btn-dangerous:hover, .ant-btn-dangerous:focus{
-  background:#FF4F4F !important;
-  color:#FFF !important;
-  border:none !important;
-}
+


 //普通按钮样式
@@ -684,6 +668,31 @@ mr0 {
  }
 }

+//警示按钮样式
+.ant-btn-dangerous{
+  background:rgba(255, 79, 79, 1) !important;
+  color:#FFF !important;
+  border:none !important;
+}
+.ant-btn-dangerous:hover{
+  background:rgba(255, 79, 79, 0.7) !important;
+  color:#FFF !important;
+  border:none !important;
+}
+.ant-btn-dangerous:focus,
+.ant-btn-dangerous:active{
+  background:rgba(255, 79, 79,1) !important;
+  color:#FFF !important;
+  border:none !important;
+}
+
+//时间选择器后的按钮样式
+.ant-picker-ok{
+  .ant-btn{
+    padding:0 8px !important;
+  }
+}
+
 //搜索框后面的按钮样式
 .ant-input-search-button{
  height:32px !important;
@@ -694,11 +703,11 @@ mr0 {
  border-right:1px solid #dfdfdf !important;
  border-bottom:1px solid #dfdfdf !important;
 }
-.ant-input-search > .ant-input-group:active > .ant-input-group-addon:last-child .ant-input-search-button{
-  border-top:1px solid #FFA100 !important;
-  border-right:1px solid #FFA100 !important;
-  border-bottom:1px solid #FFA100 !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;
@@ -706,6 +715,42 @@ mr0 {

 .ant-modal-footer {
  .ant-btn {
-    font-weight: normal !important;
+    font-weight: 400 !important;
+  }
+}
+
+//模态框的样式的公共处理
+
+
+//删除模态框的样式的的处理
+.ant-modal-confirm{
+  .ant-modal-body{
+    padding:32px 32px 24px 32px !important;
+    .ant-modal-confirm-title{
+     color: rgba(0, 0, 0, 0.85)
+    }
+    .ant-modal-confirm-content{
+      min-height:44px;
+      color: rgba(0, 0, 0, 0.65)
+    }
+  }
+}
+
+//普通模态框的样式的处理
+.ant-modal{
+  .ant-modal-title{
+    color:#333;
+    font-weight:400;
+  }
+  .ant-modal-close-x{
+    .modal-close-icon{
+      color:#999;
+      font-size:12px;
+      margin-right:6px;
+      font-weight:400;
+    }
+  }
+  .ant-modal-footer{
+    padding:10px 24px;
  }
 }
\ No newline at end of file
--- a/src/modules/course-manage/components/AddLiveBasic.jsx
+++ b/src/modules/course-manage/components/AddLiveBasic.jsx
@@ -241,7 +241,7 @@ class AddLiveBasic extends React.Component {
                className={`default-btn ${isDefaultCover ? 'disabled' : ''}`}
                onClick={this.handleResetCoverUrl}
              >使用默认图</span>
-              <div className="tips">建议尺寸690*398像素，图片支持jpg、jpeg、png格式。</div>
+              <div className="tips">建议尺寸1280*720像素，图片支持jpg、jpeg、png格式。</div>
            </div>
          </div>
        </div>
@@ -292,6 +292,7 @@ class AddLiveBasic extends React.Component {
          width={1080}
          visible={visible}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          onCancel={() => {
            this.setState({ visible: false });
          }}

--- a/src/modules/course-manage/components/AddLiveIntro.jsx
+++ b/src/modules/course-manage/components/AddLiveIntro.jsx
@@ -140,6 +140,7 @@ class AddLiveIntro extends React.Component {

  handleChangeIntro = (index, value, length) => {
    const { liveCourseMediaRequests } = this.props.data;
+    console.log('index',index);
    liveCourseMediaRequests[index].mediaContent = value;
    liveCourseMediaRequests[index].mediaContentLength = length
    this.props.onChange('liveCourseMediaRequests', liveCourseMediaRequests);

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

--- a/src/modules/course-manage/modal/AbnormalModal.jsx
+++ b/src/modules/course-manage/modal/AbnormalModal.jsx
@@ -55,6 +55,7 @@ class AbnormalModal extends React.Component {
          footer={null}
          onCancel={onClose}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          className="abnormal-modal"
        >
          { content }

--- a/src/modules/course-manage/modal/AccountChargeModal.jsx
+++ b/src/modules/course-manage/modal/AccountChargeModal.jsx
@@ -2,8 +2,8 @@
 * @Description: 云课堂充值
 * @Author: zhangyi
 * @Date: 2020-05-09 15:02:39
- * @LastEditors: wufan
- * @LastEditTime: 2020-12-22 20:30:26
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-02-01 13:59:54
 */
 import React from 'react';
 import { Modal, message, Form, InputNumber, Row, Col, Button } from "antd";
@@ -287,6 +287,7 @@ class AccountChargeModal extends React.Component {
        width={550}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="account-charge-modal"
        onCancel={() => {
          this.handleCancel();

--- a/src/modules/course-manage/modal/AccountChargeRecords.jsx
+++ b/src/modules/course-manage/modal/AccountChargeRecords.jsx
@@ -79,6 +79,7 @@ class AccountChargeRecords extends React.Component{
        width={680}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={() => {
          this.props.close();
        }}

--- a/src/modules/course-manage/modal/ChargeArgeement.jsx
+++ b/src/modules/course-manage/modal/ChargeArgeement.jsx
@@ -47,6 +47,7 @@ class ChargeArgeement extends React.Component {
        className="charge-agreement-modal"
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={() => {
          this.props.close();
        }}

--- a/src/modules/course-manage/modal/ChargeExplainModal.jsx
+++ b/src/modules/course-manage/modal/ChargeExplainModal.jsx
@@ -31,6 +31,7 @@ function ChargeExplainModal(props) {
      className="charge-explain-modal"
      width={880}
      maskClosable={false}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      onCancel={() => {
        props.close();
      }}

--- a/src/modules/course-manage/modal/ChargingDetailModal.jsx
+++ b/src/modules/course-manage/modal/ChargingDetailModal.jsx
@@ -107,6 +107,7 @@ class ChargingDetailModal extends React.Component {
        visible={true}
        width={680}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="charging-detail-modal"
        footer={null}
        onCancel={() => {

--- a/src/modules/course-manage/modal/CheckBalanceModal.jsx
+++ b/src/modules/course-manage/modal/CheckBalanceModal.jsx
@@ -47,6 +47,7 @@ class CheckBalanceModal extends React.Component {
        width={550}
        title="余额不足"
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={() => {
          this.props.close();
        }}

--- 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-28 15:19:18
+ * @LastEditTime: 2021-02-01 14:00:19
 */

 import React, { useState, useEffect } from "react";
@@ -235,6 +235,7 @@ class ClassRecordModal extends React.Component {
        footer={null}
        width={680}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="class-record-modal"
        onCancel={() => {
          this.props.close();

--- a/src/modules/course-manage/modal/LackConsumeStudentModal.jsx
+++ b/src/modules/course-manage/modal/LackConsumeStudentModal.jsx
@@ -24,6 +24,7 @@ class LackConsumeStudentModal extends React.Component {
        okText="继续保存"
        onOk={onOk}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={onClose}
        className="lack-consume-student-modal"
      >

--- a/src/modules/course-manage/modal/LiveStudentListModal.jsx
+++ b/src/modules/course-manage/modal/LiveStudentListModal.jsx
@@ -289,6 +289,7 @@ class LiveStudentListModal extends React.Component {
        width={680}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="live-student-list-modal"
        onCancel={this.props.close}
      >

--- a/src/modules/course-manage/modal/ManageCoursewareModal.jsx
+++ b/src/modules/course-manage/modal/ManageCoursewareModal.jsx
@@ -304,6 +304,7 @@ class ManageCoursewareModal extends React.Component {
        title="课件管理"
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="manage-courseware-modal"
        width={_.isEmpty(_list) ? 680 : 800}
        onCancel={() => {

--- a/src/modules/course-manage/modal/PlayBackRecordModal.jsx
+++ b/src/modules/course-manage/modal/PlayBackRecordModal.jsx
@@ -3,7 +3,7 @@
 * @Author: zhangyi
 * @Date: 2020-05-12 09:43:48
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-09 16:23:05
+ * @LastEditTime: 2021-02-01 14:00:36
 */

 import React, { useState, useEffect } from "react";
@@ -179,6 +179,7 @@ class PlayBackRecordModal extends React.Component {
        width={680}
        visible={true}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        footer={null}
        onCancel={() => {
          this.props.close();

--- a/src/modules/course-manage/modal/PreviewCourseModal.jsx
+++ b/src/modules/course-manage/modal/PreviewCourseModal.jsx
@@ -121,6 +121,7 @@ class PreviewCourseModal extends React.Component {
        onCancel={this.props.close}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="preview-live-course-modal"
      >
        <div className="container__wrap">

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -158,6 +158,7 @@ class ShareLiveModal extends React.Component {
        visible={true}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="share-live-modal"
        onCancel={this.props.close}
      >
@@ -213,7 +214,7 @@ class ShareLiveModal extends React.Component {
            { type === "videoClass" && 
            <div className="sub-title">用户可通过打开链接，报名观看视频</div>
          }
-          <div className="content">
+          <div className="content url-content">
            <div className="share-url" id="shareUrl">{shareUrl}</div>
            <Button type="primary" onClick={this.handleCopy}>复制</Button>
          </div>

--- a/src/modules/course-manage/modal/ShareLiveModal.less
+++ b/src/modules/course-manage/modal/ShareLiveModal.less
@@ -99,7 +99,6 @@
        display: flex;
        align-items: center;
        margin-top: 8px;
-
        .share-url {
          width: 212px;
          overflow: hidden;
@@ -116,6 +115,17 @@
          margin-left: -2px;
        }
      }
+      .url-content{
+        position:relative;
+        &:after{
+          content:'';
+          width: 12px;
+          height: 22px;
+          background: #EFEFEF;
+          position:absolute;
+          right:56px;
+        }
+      }

      .share-poster {
        margin-bottom: 40px;

--- a/src/modules/course-manage/modal/StartLiveModal.jsx
+++ b/src/modules/course-manage/modal/StartLiveModal.jsx
@@ -76,6 +76,7 @@ class StartLiveModal extends React.Component {
        width={550}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={this.props.close}
      >
        <div className="live-start-modal">

--- a/src/modules/course-manage/modal/TeacherLiveModal.jsx
+++ b/src/modules/course-manage/modal/TeacherLiveModal.jsx
@@ -46,6 +46,7 @@ class TeacherLiveModal extends React.Component {
        onCancel={this.props.close}
        footer={null}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <TeacherTip isXiaomai={isXiaomai} />
      </Modal>

--- a/src/modules/course-manage/modal/select-student/index.jsx
+++ b/src/modules/course-manage/modal/select-student/index.jsx
@@ -377,6 +377,7 @@ class SelectStudent extends React.Component {
        width={720}
        onCancel={this.props.close}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="livecourse__select-student-modal"
        onOk={this.handleSelectDone}
      >

--- a/src/modules/course-manage/video-course/AddVideoCourse.less
+++ b/src/modules/course-manage/video-course/AddVideoCourse.less
@@ -121,7 +121,7 @@
      margin-top: 4px;

      .tips {
-        margin-left: 16px;
+        margin-left: 4px;
        color: #999;
      }
    }

--- 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-30 15:23:47
+ * @LastEditTime: 2021-02-01 16:34:11
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -147,7 +147,7 @@ class VideoCourseList extends React.Component {
      },
      {
        title: '创建时间',
-        width: "10%",
+        width: 181,
        key: 'created',
        dataIndex: 'created',
        sorter: true,
@@ -157,7 +157,7 @@ class VideoCourseList extends React.Component {
      },
      {
        title: '更新时间',
-        width: "10%",
+        width: 181,
        key: 'updated',
        dataIndex: 'updated',
        sorter: true,
@@ -244,6 +244,7 @@ class VideoCourseList extends React.Component {
      content: '删除后，学员将不能进行观看。',
      icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
      okText: '确定',
+      okType: 'danger',
      cancelText: '取消',
      onOk: () => {
        const param ={

--- a/src/modules/course-manage/video-course/components/VideoCourseList.less
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.less
@@ -21,6 +21,9 @@
      }
    }
  }
+  .more-operate{
+    line-height:20px;
+  }
  .record__item {
    display: flex;


--- a/src/modules/course-manage/video-course/modal/WatchDataModal.jsx
+++ b/src/modules/course-manage/video-course/modal/WatchDataModal.jsx
@@ -130,9 +130,10 @@ class WatchDataModal extends React.Component {
          className="watch-data-modal"
          closable={true}
          width={800}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        >
          <div className="search-container">
-            <Search placeholder="搜索用户姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} />
+            <Search placeholder="搜索用户姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} enterButton={<span className="icon iconfont">&#xe832;</span>}/>
          </div>
          <div>
            <Table

--- a/src/modules/personalInfo/ChangePhoneModal.tsx
+++ b/src/modules/personalInfo/ChangePhoneModal.tsx
@@ -114,6 +114,7 @@ function ChangePhoneModal(props: changePhoneModalProps) {
            title="更换手机号"
            width={448}
            maskClosable={false}
+            closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
            onCancel={onClose}
            className="change-phone-modal"
            footer={[

--- a/src/modules/personalInfo/IdentificationModal.tsx
+++ b/src/modules/personalInfo/IdentificationModal.tsx
@@ -89,6 +89,7 @@ function IdentificationModal(props: IdentificationModalProps) {
            width={448}
            onCancel={onClose}
            maskClosable={false}
+            closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
            className="identification-modal"
            footer={[
                <Button

--- a/src/modules/prepare-lesson/components/FolderList.jsx
+++ b/src/modules/prepare-lesson/components/FolderList.jsx
@@ -289,7 +289,8 @@ class FolderList extends React.Component {
      Modal.confirm({
        title: '确认删除所选的文件吗？',
        content: hasRelative ? '此文件已关联了课次，删除后，学员将不能查看到此文件。' : '删除后，数据将无法恢复。',
-        icon: <span className="icon iconfont default-confirm-icon">&#xe834;</span>,
+        icon:<span className="icon iconfont default-confirm-icon">&#xe839; </span>,
+        okType: 'danger',
        onOk: () => {
          const { currentFolder } = this.state;
          axios.Apollo(DEL_FOLDER_URL_MAP[disk], {

--- a/src/modules/prepare-lesson/components/OperateArea.jsx
+++ b/src/modules/prepare-lesson/components/OperateArea.jsx
@@ -212,7 +212,8 @@ class OperateArea extends React.Component {
    Modal.confirm({
      title: '确认删除所选的文件吗？',
      content: '删除后，数据将无法恢复。',
-      icon: <span className="icon iconfont default-confirm-icon">&#xe834;</span>,
+      icon:<span className="icon iconfont default-confirm-icon">&#xe839; </span>,
+      okType: 'danger',
      onOk: () => {
        const currentFolder  = folderPathList[folderPathList.length - 1];
        Service.Hades(DEL_FOLDER_URL_MAP[disk], {

--- a/src/modules/prepare-lesson/index.jsx
+++ b/src/modules/prepare-lesson/index.jsx
@@ -85,6 +85,7 @@ class PrepareLessonPage extends React.Component {
          footer={null}
          width={680}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          className="prepare-lesson-upgrade-modal"
          onCancel={() => {
            this.setState({

--- a/src/modules/prepare-lesson/modal/CreateFolderModal.jsx
+++ b/src/modules/prepare-lesson/modal/CreateFolderModal.jsx
@@ -79,6 +79,7 @@ class CreateFolderModal extends React.Component {
        onCancel={this.handleCancel}
        onOk={this.handleOk}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        width={448}
        className="create-folder-modal"
      >

--- a/src/modules/prepare-lesson/modal/NonCompliantFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/NonCompliantFileModal.jsx
@@ -29,6 +29,7 @@ class NonCompliantFileModal extends React.Component {
        okText="继续上传"
        cancelText="放弃上传"
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={this.props.onClose}
        onOk={this.props.onOk}
        className="prepare-lesson__non-compliant-file-modal"

--- a/src/modules/prepare-lesson/modal/ScanFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/ScanFileModal.jsx
@@ -26,6 +26,7 @@ class ScanFileModal extends React.Component {
        width={680}
        className="scan-file-modal"
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <div className="scan-file-modal" style={{ width: 632 }}>
          {(fileType === "JPG" || fileType === 'PNG') && (

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
@@ -538,6 +538,7 @@ class SelectPrepareFileModal extends React.Component {
        footer={footer}
        width={680}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        onCancel={this.handleClose}
        className="select-prepare-file-modal"
      >
@@ -583,12 +584,12 @@ class SelectPrepareFileModal extends React.Component {
        </div>
        {
          !_.isEmpty(folderList) ?
-           <div
+           <div>
+            <div className="file-list"  
              onScrollCapture={() => this.handleScrollEvent()}
              style={{ height: '320px', overflowY: 'scroll' }}
              ref="fileListRef"
            >
-            <div className="file-list">
              {
                folderList.map((folder, index) => {
                  const { folderType, folderSize, folderFormat, folderName } = folder;

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.less
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.less
@@ -52,7 +52,6 @@
  .file-list {
    border: 1px solid #E8E8E8;
    border-radius: 4px;
-
    .file-item {
      display: flex;
      align-items: center;

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -297,7 +297,8 @@ class FolderList extends React.Component {
    Modal.confirm({
      title: '确认删除所选的文件吗？',
      content: '删除后，数据将无法恢复。',
-      icon: <span className="icon iconfont default-confirm-icon">&#xe834;</span>,
+      icon:<span className="icon iconfont default-confirm-icon">&#xe839; </span>,
+      okType: 'danger',
      onOk: () => {
        const { currentFolder } = this.state;
        Service.Hades(DEL_FOLDER_URL_MAP[disk], {

--- a/src/modules/resource-disk/components/OperateArea.jsx
+++ b/src/modules/resource-disk/components/OperateArea.jsx
@@ -211,7 +211,8 @@ class OperateArea extends React.Component {
    Modal.confirm({
      title: '确认删除所选的文件吗？',
      content: '删除后，数据将无法恢复。',
-      icon: <span className="icon iconfont default-confirm-icon">&#xe834;</span>,
+      icon:<span className="icon iconfont default-confirm-icon">&#xe839; </span>,
+      okType: 'danger',
      onOk: () => {
        const  currentFolder  = folderPathList[folderPathList.length - 1];
        Service.Hades(DEL_FOLDER_URL_MAP[disk], {
@@ -341,7 +342,6 @@ class OperateArea extends React.Component {
          <Button
            onClick={this.handleToggleCreateFolderModal}
            disabled={showResultPage}
-            className="create-btn"
          >
            <div className="btn-content">
              <span className="icon iconfont">&#xe7a2;</span>

--- a/src/modules/resource-disk/modal/CreateFolderModal.jsx
+++ b/src/modules/resource-disk/modal/CreateFolderModal.jsx
@@ -80,6 +80,7 @@ class CreateFolderModal extends React.Component {
        onOk={this.handleOk}
        width={448}
        maskClosable={false}
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
        className="create-folder-modal"
      >
        <Form>

--- a/src/modules/resource-disk/modal/ScanFileModal.jsx
+++ b/src/modules/resource-disk/modal/ScanFileModal.jsx
@@ -24,6 +24,7 @@ class ScanFileModal extends React.Component {
        footer={null}
        width={680}
        className="scan-file-modal"
+        closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
      >
        <div className="scan-file-modal" style={{ width: 632 }}>
          {(fileType === "JPG" || fileType === 'PNG') && (

--- a/src/modules/store-manage/EmployeeAddOrEditModal.tsx
+++ b/src/modules/store-manage/EmployeeAddOrEditModal.tsx
@@ -208,6 +208,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
      onCancel={props.onClose}
      onOk={handleOk}
      maskClosable={false}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
    >
      <Row>
        <Col span={16}>

--- a/src/modules/store-manage/StoreH5DecorationTab.jsx
+++ b/src/modules/store-manage/StoreH5DecorationTab.jsx
 /*
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
- * @LastEditors: wufan
- * @LastEditTime: 2021-01-18 21:22:44
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-02-01 14:02:11
 * @Description: web店铺banner页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -164,9 +164,10 @@ class StoreH5Decoration extends React.Component {
    return confirm({
      title: "你确定要删除这个banner吗？",
      icon: (
-        <span className="icon iconfont default-confirm-icon">&#xe834;</span>
+        <span className="icon iconfont default-confirm-icon">&#xe839; </span>
      ),
      okText: "删除",
+      okType: 'danger',
      cancelText: "取消",
      onOk: () => {
        this.handleDeleteDecoration(record);
@@ -425,6 +426,7 @@ class StoreH5Decoration extends React.Component {
            this.setState({ visible: false });
          }}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          footer={[
            <Button
              key="back"

--- a/src/modules/store-manage/StoreWebDecorationTab.jsx
+++ b/src/modules/store-manage/StoreWebDecorationTab.jsx
@@ -163,9 +163,10 @@ class StoreWebDecoration extends React.Component {
    return confirm({
      title: "你确定要删除这个banner吗？",
      icon: (
-        <span className="icon iconfont default-confirm-icon">&#xe834;</span>
+        <span className="icon iconfont default-confirm-icon">&#xe839; </span>
      ),
      okText: "删除",
+      okType: 'danger',
      cancelText: "取消",
      onOk: () => {
        this.handleDeleteDecoration(record);
@@ -423,6 +424,7 @@ class StoreWebDecoration extends React.Component {
            this.setState({ visible: false });
          }}
          maskClosable={false}
+          closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
          footer={[
            <Button
              key="back"

--- a/src/modules/store-manage/UserManagePage.tsx
+++ b/src/modules/store-manage/UserManagePage.tsx
 /*
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
- * @LastEditors: wufan
- * @LastEditTime: 2021-02-01 14:12:55
+ * @LastEditors: zhangleyuan
+ * @LastEditTime: 2021-02-02 10:22:34
 * @Description: 用户管理页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -117,6 +117,7 @@ function UserManagePage() {
                    }
                    setQuery(_query);
                  }}
+                  enterButton={<span className="icon iconfont">&#xe832;</span>}
                />

              </div>

--- a/src/modules/store-manage/modal/CatalogAddOrEditModal.tsx
+++ b/src/modules/store-manage/modal/CatalogAddOrEditModal.tsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-15 16:12:32
+ * @LastEditTime: 2021-02-01 14:02:23
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -84,6 +84,7 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) {
        </Button>
      ]}
      maskClosable={false}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
    >
     <Form
        labelCol={ {span:5 }}

--- a/src/modules/store-manage/modal/SecondCatalogAddOrEditModal.tsx
+++ b/src/modules/store-manage/modal/SecondCatalogAddOrEditModal.tsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-29 16:58:09
+ * @LastEditTime: 2021-02-01 14:02:30
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -139,6 +139,7 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
        </Button>
      ]}
      maskClosable={false}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
    >
     <Form
        labelCol={ {span:6 }}