Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web

src/bu-components/ChooseMembersModal.jsx

@@ -10,6 +10,8 @@ import Service from '@/common/js/service';
 // import _ from 'underscore';
 import './ChooseMembersModal.less';
 import User from '@/common/js/user'
+import { XMTable } from '@/components';
+import college from '@/common/lottie/college';
 
 const { Search } = Input;
 
@@ -155,7 +157,7 @@ class ChooseMembersModal extends React.Component {
     let rightsList = [];            // 保存新加进去的成员
     selectUserList.map((item) => {
       rightsList.push({
-        rights: "LOOK_DOWNLOAD",
+        rights: "LOOK",
         userId: item.userId
       })
       return rightsList
@@ -203,10 +205,8 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         dataIndex: 'avatar',
-        width: '40%',
         render: (value, record) => {
           const { adminName } = record;
-
           return (
             <div className='avatar'>
               {
@@ -232,7 +232,7 @@ class ChooseMembersModal extends React.Component {
         title: '学员名',
         key: 'adminNameRight',
         dataIndex: 'adminName',
-        width: '70%',
+        width: '65%',
         render: (value, record) => {
           const { adminName = '', avatar } = record;
           return (
@@ -293,16 +293,19 @@ class ChooseMembersModal extends React.Component {
                   enterButton={<span className="icon iconfont">&#xe832;</span>}
                 />
                 <div className='container-left-body-table'>
-                  <Table 
+                  <XMTable 
+                    renderEmpty={{
+                      image: college,
+                      description: '暂无数据'
+                    }}
                     rowKey={(record) => record.userId}
                     dataSource={allUserList}
                     columns={this.selectedColumnsLeft()}               
                     pagination={false}
                     scroll={{ y: 290}}
-                    // bordered={true}
                     size={'small'}
                     rowSelection={{
-                      columnWidth : 24,
+                      columnWidth : 63,
                       selectedRowKeys,
                       onChange : this.onChangeRow,
                       getCheckboxProps : this.getCheckboxProps,
@@ -326,7 +329,11 @@ class ChooseMembersModal extends React.Component {
                 <span className={ (selectUserList.length > 0) ? 'span-right-l' : null }>清空</span>
               </div>
               <div className='container-right-body'>
-                <Table 
+                <XMTable 
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据'
+                  }}
                   rowKey={(record) => record.userId}
                   dataSource={selectUserList}
                   columns={this.selectedColumnsRight()}

src/bu-components/ChooseMembersModal.less

@@ -37,7 +37,7 @@
             >tr >td {
               border-bottom: none;
               background-color: #fff !important;
-
+              padding:8px 8px !important;
             }
           }
         }
@@ -45,6 +45,14 @@
         .ant-empty-normal {
           margin: 100px 0 !important;
         }
+
+        .ant-empty {
+          margin-top: 60px; 
+        }
+        .ant-empty-description {
+          color: #999;
+        }
+
         .avatar{
           display: flex;
           align-items: center;
@@ -119,6 +127,13 @@
         margin: 144px 0 !important;
       }
 
+      .ant-empty {
+        margin-top: 60px; 
+      }
+      .ant-empty-description {
+        color: #999;
+      }
+
       .avatar{
         display: flex;
         align-items: center;

src/bu-components/CopyFileModal.jsx

@@ -8,7 +8,7 @@ import React from 'react';
 import { Modal, Button, Breadcrumb, Radio, message  } from 'antd';
 import Service from '@/common/js/service';
 import { FILE_TYPE_ICON_MAP, DEFAULT_SIZE_UNIT } from "@/domains/resource-disk/constants";
-import { LottieIcon } from 'xiaomai-b-components';
+import LottieIcon from '@/components/LottieIcon';
 import _ from 'underscore';
 import { getEllipsText } from "@/domains/basic-domain/utils";
 import * as lodash from 'lodash';
@@ -334,6 +334,8 @@ class CopyFileModal extends React.Component {
           <div className="lottie-box">
             <LottieIcon
               title={<span className="desc">这个文件夹是空的</span>}
+              type="college"
+              size={150}
             />
           </div>
         }

src/bu-components/CopyFileModal.less

@@ -57,12 +57,17 @@
   }
   
 }
-.lottie-box {
+.copy-body {
+  .lottie-box {
     border:1px solid #E8E8E8;
     border-radius:4px;
     height: 320px;
-}
+  }
   
-.lottie-icon{
-  margin: 100px 0;
+  .lottie-icon{
+    margin: 70px 0 !important;
+    .lottie-icon__title {
+      color: #999;
+    }
+  }
 }

src/bu-components/ManagingMembersModal.jsx

@@ -19,7 +19,7 @@ class ManagingMembersModal extends React.Component {
       addManagingMember: false,                     // 是否点击了添加成员
       storeId :User.getStoreId() ,   // 学院Id
       iconRotateList: [],
-      userAuthority : ['可编辑', '可查看/下载', '仅可查看', '', '创建者', '学院管理员'] ,  // 空 代表删除
+      userAuthority : ['可编辑', '可下载', '可查看', '', '创建者', '学院管理员'] ,  // 空 代表删除
     } 
   }
   componentDidMount() {
@@ -64,7 +64,7 @@ class ManagingMembersModal extends React.Component {
 
   // 修改成员权限
   updateFileUserAuthority = (params, newRights = 1) => {
-    const rightList =  ['EDIT', 'LOOK_DOWNLOAD', ''];
+    const rightList =  ['EDIT', 'LOOK_DOWNLOAD', 'LOOK'];
     let { iconRotateList } = this.state;
     let _params = params;
     _params.rights = rightList[newRights]; 
@@ -173,10 +173,10 @@ class ManagingMembersModal extends React.Component {
             <span className='menu-bottom'>下载、复制</span>
           </div>
         </Menu.Item>
-        {/* <Menu.Item key="LOOK" >
-          <div onClick={() => this.updateFileUserAuthority(params, 2)}>仅可查看</div>
-          <span className='menu-bottom'>{userAuthority[2]}</span>
-        </Menu.Item> */}
+        <Menu.Item key="LOOK" >
+          <div onClick={() => this.updateFileUserAuthority(params, 2)}>{userAuthority[2]}</div>
+          <span className='menu-bottom'>查看</span>
+        </Menu.Item>
         <Menu.Divider key='LINE'/>
         <Menu.Item key="REMOVE" >
           <div className='remove' onClick={() => this.removeUser(params, userAuthority[3])}>移除</div>
@@ -247,6 +247,8 @@ class ManagingMembersModal extends React.Component {
               num = 1;
             } else if (record.rights === "EDIT") {
               num = 0;
+            }else if(record.rights=="LOOK"){
+              num = 2;
             }
           }
           return (

src/bu-components/ManagingMembersModal.less

@@ -35,6 +35,9 @@
     .ant-table-row{
       background-color: #fff !important;
     }
+    tr:first-child{
+      display: none;
+    }
     .ant-table-row:hover{
       background-color: #E9E9E9;
     }

src/bu-components/SelectPrepareFileModal.jsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { Modal, Button, Radio, Checkbox, message, Tooltip } from 'antd';
 import _ from 'underscore';
 import * as lodash from 'lodash';
-import { LottieIcon } from 'xiaomai-b-components';
+import LottieIcon from '@/components/LottieIcon';
 
 import Service from '@/common/js/service';
 import { getEllipsText } from "@/domains/basic-domain/utils";
@@ -647,6 +647,8 @@ class SelectPrepareFileModal extends React.Component {
           <Otherwise>
             <LottieIcon
               title={<span className="desc">这个文件夹是空的</span>}
+              type="college"
+              size={150}
             />
           </Otherwise>
         </Choose>

src/bu-components/SelectPrepareFileModal.less

@@ -4,10 +4,10 @@
   }
   
   .lottie-icon {
-    margin: 12px 0 0 0;
+    margin: 0;
     border: 1px solid #E8E8E8;
     border-radius: 4px;
-    padding: 100px 0;
+    padding: 69px 0 59px 0;
     
     .desc {
       color: #999;

src/components/LottieIcon.less

+
+.lottie-icon{
+  text-align: center;
+  margin-top: 200px;
+  margin-bottom: 50px;
+  
+  &__title{
+    font-size:14px;
+    font-family:PingFangSC-Regular;
+    font-weight:400;
+    color:#999;
+    line-height:20px;
+    margin-top: 20px;
+  }
+}
\ No newline at end of file

src/components/LottieIcon.tsx

+/*
+ * @Author: wufan
+ * @Date: 2021-06-15 13:48:35
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-06-15 14:24:57
+ * @Description: Description
+ */
+import React from 'react';
+import Lottie from 'react-lottie';
+
+import student from '@/common/lottie/student.json';
+import activity from '@/common/lottie/activity.json';
+import teacher from '@/common/lottie/teacher.json';
+import college from '@/common/lottie/college.json';
+
+import './LottieIcon.less';
+
+interface LottieIconInterface {
+  size: number,
+  type: string,
+  title: string,
+  isStopped: boolean,
+  isPaused: boolean,
+}
+
+const ANIMATION_DATA_MAP: {
+  [key: string]: any,
+} = {
+  student,
+  activity,
+  teacher,
+  college
+}
+
+function LottieIcon(props: LottieIconInterface) {
+  const {
+    title,
+    size = 90,
+    type = 'student',
+    isPaused = true,
+    isStopped = true,
+    
+  } = props;
+
+  const options = {
+    loop: true,
+    autoplay: true,
+    animationData: ANIMATION_DATA_MAP[type],
+    rendererSettings: {
+      preserveAspectRatio: 'xMidYMid slice'
+    }
+  }
+
+  return (
+    <div className="lottie-icon">
+      <Lottie
+        options={options}
+        width={size}
+        height={size}
+        isPaused={isPaused}
+        isStopped={isStopped}
+      />
+
+      <div className="lottie-icon__title">{title}</div>
+    </div>
+  )
+}
+
+export default LottieIcon;
\ No newline at end of file

src/components/WatchDataHeader.tsx

+/*
+ * @Author: wufan
+ * @Date: 2021-05-26 10:29:56
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-06-17 14:15:00
+ * @Description: Description
+ */
 import React from "react";
-import { Tag } from 'antd'
 import "./WatchDataHeader.less";
 
 interface WatchDataHeaderProps {

src/data-source/aidTool/request-apis.ts

@@ -2,89 +2,89 @@
  * @Author: yuananting
  * @Date: 2021-03-03 15:13:12
  * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-25 10:07:03
+ * @LastEditTime: 2021-06-16 09:57:18
  * @Description: 助学工具接口
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
-import Service from '@/common/js/service'
+import Service from '@/common/js/service';
 
 export function queryExternalCategoryTree(params: object) {
-  return Service.Hades('public/externalHades/queryCategoryTree', params)
+  return Service.Hades('public/externalHades/queryCategoryTree', params);
 }
 
 export function queryCategoryTree(params: object) {
-  return Service.Hades('public/hades/queryCategoryTree', params)
+  return Service.Hades('public/hades/queryCategoryTree', params);
 }
 
 export function addCategory(params: object) {
-  return Service.Hades('public/hades/addCategory', params)
+  return Service.Hades('public/hades/addCategory', params);
 }
 
 export function delCategory(params: object) {
-  return Service.Hades('public/hades/delCategory', params)
+  return Service.Hades('public/hades/delCategory', params);
 }
 
 export function editCategory(params: object) {
-  return Service.Hades('public/hades/editCategory', params)
+  return Service.Hades('public/hades/editCategory', params);
 }
 
-export function editCategoryTree(params: object) {
-  return Service.Hades('public/hades/editCategoryTree', params)
+export function moveCategory(params: object) {
+  return Service.Hades('public/hades/moveCategory', params);
 }
 
 export function queryQuestionPageList(params: object) {
-  return Service.Hades('public/hades/queryQuestionPageList', params)
+  return Service.Hades('public/hades/queryQuestionPageList', params);
 }
 
 export function addQuestion(params: object) {
-  return Service.Hades('public/hades/addQuestion', params)
+  return Service.Hades('public/hades/addQuestion', params);
 }
 
 export function deleteQuestion(params: object) {
-  return Service.Hades('public/hades/deleteQuestion', params)
+  return Service.Hades('public/hades/deleteQuestion', params);
 }
 
 export function queryQuestionDetails(params: object) {
-  return Service.Hades('public/hades/queryQuestionDetails', params)
+  return Service.Hades('public/hades/queryQuestionDetails', params);
 }
 
 export function editQuestion(params: object) {
-  return Service.Hades('public/hades/editQuestion', params)
+  return Service.Hades('public/hades/editQuestion', params);
 }
 
 export function batchImport(params: object) {
-  return Service.Hades('public/hades/batchImport', params)
+  return Service.Hades('public/hades/batchImport', params);
 }
 
 export function createPaper(params: object) {
-  return Service.Hades('public/hades/createPaper', params)
+  return Service.Hades('public/hades/createPaper', params);
 }
 
 export function queryPaperPageList(params: object) {
-  return Service.Hades('public/hades/queryPaperPageList', params)
+  return Service.Hades('public/hades/queryPaperPageList', params);
 }
 
 export function deletePaper(params: object) {
-  return Service.Hades('public/hades/deletePaper', params)
+  return Service.Hades('public/hades/deletePaper', params);
 }
 
 export function queryPaperDetail(params: object) {
-  return Service.Hades('public/hades/queryPaperDetail', params)
+  return Service.Hades('public/hades/queryPaperDetail', params);
 }
 
 export function viewPaper(params: object) {
-  return Service.Hades('public/hades/viewPaper', params)
+  return Service.Hades('public/hades/viewPaper', params);
 }
 
 export function editPaper(params: object) {
-  return Service.Hades('public/hades/editPaper', params)
+  return Service.Hades('public/hades/editPaper', params);
 }
 
 export function batchQueryQuestionDetails(params: object) {
-  return Service.Hades('public/hades/batchQueryQuestionDetails', params)
+  return Service.Hades('public/hades/batchQueryQuestionDetails', params);
 }
 
 export function queryQuestionPageListWithContent(params: object) {
-  return Service.Hades('public/hades/queryQuestionPageListWithContent', params)
+  return Service.Hades('public/hades/queryQuestionPageListWithContent', params);
 }

src/domains/aid-tool-domain/AidToolService.ts

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-03-11 11:34:37
  * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-24 23:44:39
+ * @LastEditTime: 2021-06-16 09:56:46
  * @Description: 助学工具接口
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -12,7 +12,7 @@ import {
   addCategory,
   delCategory,
   editCategory,
-  editCategoryTree,
+  moveCategory,
   addQuestion,
   queryQuestionPageList,
   deleteQuestion,
@@ -26,8 +26,8 @@ import {
   viewPaper,
   editPaper,
   batchQueryQuestionDetails,
-  queryQuestionPageListWithContent
-} from '@/data-source/aidTool/request-apis'
+  queryQuestionPageListWithContent,
+} from '@/data-source/aidTool/request-apis';
 export default class AidToolService {
   /**
    * 查询运营端分类书
@@ -35,101 +35,101 @@ export default class AidToolService {
    * @returns
    */
   static queryExternalCategoryTree(parmas: any) {
-    return queryExternalCategoryTree(parmas)
+    return queryExternalCategoryTree(parmas);
   }
 
   // 获取题目分类树
   static queryCategoryTree(params: any) {
-    return queryCategoryTree(params)
+    return queryCategoryTree(params);
   }
 
   // 新增题目分类
   static addCategory(params: any) {
-    return addCategory(params)
+    return addCategory(params);
   }
 
   // 删除分类
   static delCategory(params: any) {
-    return delCategory(params)
+    return delCategory(params);
   }
 
   // 编辑分类
   static editCategory(params: any) {
-    return editCategory(params)
+    return editCategory(params);
   }
 
-  // 编辑分类树（拖拽）
-  static editCategoryTree(params: any) {
-    return editCategoryTree(params)
+  // 拖拽移动分类树
+  static moveCategory(params: any) {
+    return moveCategory(params);
   }
 
   // 查询题目列表
   static queryQuestionPageList(params: any) {
-    return queryQuestionPageList(params)
+    return queryQuestionPageList(params);
   }
 
   // 添加题目
   static addQuestion(params: any) {
-    return addQuestion(params)
+    return addQuestion(params);
   }
 
   // 删除题目
   static deleteQuestion(params: any) {
-    return deleteQuestion(params)
+    return deleteQuestion(params);
   }
 
   // 预览题目
   static queryQuestionDetails(params: any) {
-    return queryQuestionDetails(params)
+    return queryQuestionDetails(params);
   }
 
   // 编辑题目
   static editQuestion(params: any) {
-    return editQuestion(params)
+    return editQuestion(params);
   }
 
   // 批量导入
   static batchImport(params: any) {
-    return batchImport(params)
+    return batchImport(params);
   }
 
   // 创建试卷
   static createPaper(params: any) {
-    return createPaper(params)
+    return createPaper(params);
   }
 
   // 查询试卷列表
   static queryPaperPageList(params: any) {
-    return queryPaperPageList(params)
+    return queryPaperPageList(params);
   }
 
   // 删除试卷
   static deletePaper(params: any) {
-    return deletePaper(params)
+    return deletePaper(params);
   }
 
   // 编辑前查询试卷信息
   static queryPaperDetail(params: any) {
-    return queryPaperDetail(params)
+    return queryPaperDetail(params);
   }
 
   // 预览试卷
   static viewPaper(params: any) {
-    return viewPaper(params)
+    return viewPaper(params);
   }
 
   // 编辑试卷
   static editPaper(params: any) {
-    return editPaper(params)
+    return editPaper(params);
   }
 
   // 操作试卷-预览查询多题目信息
   static batchQueryQuestionDetails(params: any) {
-    return batchQueryQuestionDetails(params)
+    return batchQueryQuestionDetails(params);
   }
 
   // 操作试卷-选择题目列表带题目详情
   static queryQuestionPageListWithContent(params: any) {
-    return queryQuestionPageListWithContent(params)
+    return queryQuestionPageListWithContent(params);
   }
 }

src/modules/college-manage/modal/ChooseMembersModal.jsx

@@ -210,7 +210,6 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         dataIndex: 'avatar',
-        width: '40%',
         render: (value, record) => {
           const { name } = record;
 
@@ -328,7 +327,7 @@ class ChooseMembersModal extends React.Component {
                     }}
                     size={'small'}
                     rowSelection={{
-                      columnWidth : 24,
+                      columnWidth : 63,
                       selectedRowKeys,
                       onChange : this.onChangeRow,
                       getCheckboxProps : this.getCheckboxProps,

src/modules/course-manage/modal/ManageCoursewareModal.jsx

@@ -4,15 +4,15 @@
  * @Last Modified by: chenshu
  * @Last Modified time: 2021-06-08 18:18:46
  */
-import React, { useEffect, useState } from 'react';
-import { Modal, Button, Table, Progress, message, Tooltip, Spin, Popconfirm } from 'antd';
+import React from 'react';
+import { Modal, Button, Table, message, Tooltip, Spin, Popconfirm } from 'antd';
 import { QuestionCircleOutlined,LoadingOutlined} from "@ant-design/icons";
 import _ from 'underscore';
 import moment from 'moment';
 import Lottie from "lottie-web";
 import User from '@/common/js/user';
-import { suffixType, DEFAULT_SIZE_UNIT, SupportFileType } from '@/common/constants/academic/liveEnum';
-import { FileVerifyMap, FileTypeIcon, DISK_MAP } from '@/common/constants/academic/lessonEnum';
+import { suffixType, DEFAULT_SIZE_UNIT } from '@/common/constants/academic/liveEnum';
+import { FileVerifyMap, FileTypeIcon } from '@/common/constants/academic/lessonEnum';
 import ScanFileModal from '@/modules/prepare-lesson/modal/ScanFileModal'
 import SelectPrepareFileModal from '@/modules/prepare-lesson/modal/SelectPrepareFileModal';
 import Service from '@/common/js/service';
@@ -229,14 +229,18 @@ class ManageCoursewareModal extends React.Component {
           const antIcon = <LoadingOutlined/>;
           const type = FileVerifyMap[fileType].type;
           return <div className="courseware-name" onClick={() => this.handleScanFile(item)}>
-            {(type === 'JPG' || type === 'PNG') && item.progress ?
+              <Choose>
+                <When condition={(type === 'JPG' || type === 'PNG') && item.progress}>
                   <Spin indicator={antIcon} />
-              :<img  
+                </When>
+                <Otherwise>
+                  <img  
                   src={FileTypeIcon[FileVerifyMap[fileType].type] || (item.docUrls[0] || {}).conversionFileUrl}
                   alt=""
                   className="item-img"
                 />
-            }
+                </Otherwise>
+              </Choose>
             <Tooltip title={item.fileName}><span className="name">{item.fileName}</span></Tooltip>
           </div>
         },
@@ -270,7 +274,7 @@ class ManageCoursewareModal extends React.Component {
         width: "16%",
         dataIndex: "control",
         render: (_value, item) => {
-          const { uploadObject, failObject, cancelObject } = this.state;
+          const { failObject } = this.state;
           const uploadFail = failObject[item.id];
 
           // 上课前45分钟/上课中/已结束的情况下都不可操作
@@ -295,7 +299,7 @@ class ManageCoursewareModal extends React.Component {
     const {
       list, scanFileModal, editData, cancelObject,
       showSelectFileModal, selectedFileList,
-      diskList, currentRootDisk, isLessonPermission
+      diskList
     } = this.state;
     const _list = _.reject(list, (item) => cancelObject[item.id]);
     return (

src/modules/knowledge-base/components/Classification.jsx

@@ -2,17 +2,17 @@
  * @Description:
  * @Author: zangsuyun
  * @Date: 2021-03-19 18:05:23
- * @LastEditors: wufan
- * @LastEditTime: 2021-05-30 16:48:46
+ * @LastEditors: fusanqiasng
+ * @LastEditTime: 2021-06-15 11:20:24
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
-import React, { Component } from "react";
-import { Input, Button, Tree } from "antd";
-import "./Classification.less";
-import User from "@/common/js/user";
-import KnowledgeAPI from "@/data-source/knowledge/request-api";
-import Bus from "@/core/bus";
+import React, { Component } from 'react';
+import { Input, Button, Tree } from 'antd';
+import './Classification.less';
+import User from '@/common/js/user';
+import KnowledgeAPI from '@/data-source/knowledge/request-api';
+import Bus from '@/core/bus';
 
 const { Search } = Input;
 const { DirectoryTree } = Tree;
@@ -21,7 +21,7 @@ class Classification extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKeys: props.selectedKeys ? [props.selectedKeys] : ["0"],
+      selectedKeys: props.selectedKeys ? [props.selectedKeys] : ['0'],
       searchValue: null,
       NewEditQuestionBankCategory: null, //新增或编辑分类模态框
       ImportCourseCategory: null, // 引用课程分类模态框
@@ -32,11 +32,11 @@ class Classification extends Component {
 
   componentDidMount() {
     this.queryCategoryTree();
-    Bus.bind('knowledgeCategoryTree', this.queryCategoryTree)
+    Bus.bind('knowledgeCategoryTree', this.queryCategoryTree);
   }
 
   componentWillUnmount() {
-    Bus.unbind('knowledgeCategoryTree', this.queryCategoryTree)
+    Bus.unbind('knowledgeCategoryTree', this.queryCategoryTree);
   }
 
   shouldComponentUpdate = (nextProps, nextState) => {
@@ -79,7 +79,7 @@ class Classification extends Component {
     };
     KnowledgeAPI.getCategoryTree(query).then((res) => {
       const { categoryList = [], noCategoryCnt = 0 } = res.result;
-      let str = "未分类";
+      let str = '未分类';
       if (categoryName) {
         this.setState({ autoExpandParent: true });
         if (str.indexOf(categoryName) < 0) {
@@ -93,8 +93,8 @@ class Classification extends Component {
           this.setState({ expandedKeys: nodeId });
         } else {
           const defaultNode = {
-            id: "0",
-            categoryName: "未分类",
+            id: '0',
+            categoryName: '未分类',
             categoryCount: noCategoryCnt,
           };
           categoryList.unshift(defaultNode);
@@ -110,8 +110,8 @@ class Classification extends Component {
       } else {
         this.setState({ autoExpandParent: false });
         const defaultNode = {
-          id: "0",
-          categoryName: "未分类",
+          id: '0',
+          categoryName: '未分类',
           categoryCount: noCategoryCnt,
         };
         categoryList.unshift(defaultNode);
@@ -140,39 +140,35 @@ class Classification extends Component {
       item.title =
         !value || (value && item.categoryName.indexOf(value) > -1) ? (
           <span>
-            {item.categoryName}（{item.categoryCount}）
+            {item.categoryName}
+            {item.categoryCount > 0 && <span>（{item.categoryCount}）</span>}
           </span>
         ) : (
           <span style={{ opacity: 0.5 }}>
-            {item.categoryName}（{item.categoryCount}）
+            {item.categoryName}
+            {item.categoryCount > 0 && <span>（{item.categoryCount}）</span>}
           </span>
         );
       item.icon =
-        item.categoryName === "未分类" ? (
+        item.categoryName === '未分类' ? (
           <img
             style={{
-              width: "24px",
-              height: "24px",
-              opacity:
-                !value || (value && item.categoryName.indexOf(value) > -1)
-                  ? 1
-                  : 0.5,
+              width: '24px',
+              height: '24px',
+              opacity: !value || (value && item.categoryName.indexOf(value) > -1) ? 1 : 0.5,
             }}
-            src="https://image.xiaomaiketang.com/xm/defaultCategory.png"
-            alt=""
+            src='https://image.xiaomaiketang.com/xm/defaultCategory.png'
+            alt=''
           />
         ) : (
           <img
             style={{
-              width: "24px",
-              height: "24px",
-              opacity:
-                !value || (value && item.categoryName.indexOf(value) > -1)
-                  ? 1
-                  : 0.5,
+              width: '24px',
+              height: '24px',
+              opacity: !value || (value && item.categoryName.indexOf(value) > -1) ? 1 : 0.5,
             }}
-            src="https://image.xiaomaiketang.com/xm/hasCategory.png"
-            alt=""
+            src='https://image.xiaomaiketang.com/xm/hasCategory.png'
+            alt=''
           />
         );
       if (item.sonCategoryList) {
@@ -186,36 +182,30 @@ class Classification extends Component {
   };
 
   render() {
-    const {
-      treeData,
-      expandedKeys,
-      selectedKeys,
-      autoExpandParent,
-    } = this.state;
+    const { treeData, expandedKeys, selectedKeys, autoExpandParent } = this.state;
     return (
-      <div className="question-bank-sider">
-        <div className="sider-title">知识分类</div>
+      <div className='question-bank-sider'>
+        <div className='sider-title'>知识分类</div>
         <Search
-          className="sider-search"
-          placeholder="搜索名称分类"
+          className='sider-search'
+          placeholder='搜索名称分类'
           onSearch={(value) => {
             this.queryCategoryTree(value);
           }}
-          enterButton={<span className="icon iconfont">&#xe832;</span>}
-          style={{width: 230}}
+          enterButton={<span className='icon iconfont'>&#xe832;</span>}
+          style={{ width: 230 }}
         />
-        <div className="sider-btn">
+        <div className='sider-btn'>
           <Button
             onClick={() => {
               window.RCHistory.push({
-                pathname: "/course-category-manage?from=knowledge",
+                pathname: '/course-category-manage?from=knowledge',
               });
-            }}
-          >
+            }}>
             分类管理
           </Button>
         </div>
-        <div className="sider-tree">
+        <div className='sider-tree'>
           <DirectoryTree
             expandedKeys={expandedKeys}
             autoExpandParent={autoExpandParent}

src/modules/plan-manage/components/ExpiredCourseList.jsx

 import React from 'react';
-import { Button } from 'antd';
 import { withRouter } from 'react-router-dom';
-import User from '@/common/js/user';
 import './ExpiredCourseList.less';
 
 function ExpiredCourseList(props) {

src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx

@@ -7,23 +7,20 @@
  */
 
 import React from 'react';
-import { Modal, Button, Radio, Checkbox, Spin, Upload, message, Tooltip } from 'antd';
-import InfiniteScroll from 'react-infinite-scroller';
-
+import { Modal, Button, Radio, Checkbox, message, Tooltip } from 'antd';
 import User from '@/common/js/user';
 import { getEllipsText } from "@/core/util";
-import DefaultIcon from '@/modules/common/DefaultIcon';
 import UploadProgressModal from './UploadProgressModal';
 import NonCompliantFileModal from './NonCompliantFileModal';
 import Service from '@/common/js/service';
 import _ from 'underscore';
 import {
-  DEFAULT_SIZE_UNIT, FileTypeIcon, NonCompliantFileMap,
-  DISK_LIST, SupportFileType, LocalFileType,FileVerifyMap
+  DEFAULT_SIZE_UNIT, FileTypeIcon,
+   SupportFileType, FileVerifyMap
 } from "@/common/constants/academic/lessonEnum";
 
 import { getFileTypeByName } from '../components/FolderManage';
-
+import LottieIcon from '@/components/LottieIcon';
 import './SelectPrepareFileModal.less';
 
 const defaultQuery = {
@@ -660,9 +657,10 @@ class SelectPrepareFileModal extends React.Component {
               }
             </div>
           </div> :
-          <DefaultIcon
-            type='student'
+            <LottieIcon
             title={<span className="desc">这个文件夹是空的</span>}
+            type="college"
+            size={150}
           />
         }
 

src/modules/resource-disk/components/OperateArea.jsx

@@ -13,7 +13,7 @@ import _ from 'underscore';
 import Service from '@/common/js/service';
 import { getEllipsText } from '@/domains/basic-domain/utils';
 
-import { DEFAULT_SIZE_UNIT, LOCAL_FILE_TYPE_MAP,FILR_VERIFY_MAP,SUPPORT_FILE_TYPE_MAP} from '@/domains/resource-disk/constants';
+import { DEFAULT_SIZE_UNIT,FILR_VERIFY_MAP,SUPPORT_FILE_TYPE_MAP} from '@/domains/resource-disk/constants';
 import { getFileTypeByName } from '@/domains/resource-disk/utils';
 
 import UploadProgressModal from '@/bu-components/UploadProgressModal';

src/modules/resource-disk/index.jsx

@@ -29,25 +29,6 @@ class PrepareLessonPage extends React.Component {
     }
   }
 
-  componentWillMount() {
-    // this.handleFetchDiskList();
-  }
-
-  handleFetchDiskList = async () => {
-    const res = await Service.Hades('public/apollo/getUserDisk', {});
-    const { result = [] } = res;
-    const diskList = result.map((item) => {
-      return {
-        ...item,
-        folderName: DISK_MAP[item.disk]
-      }
-    });
-    this.setState({
-      diskList,
-      currentRootDisk: diskList[0] || defaultRootDisk
-    });
-  }
-
   handleChangeDisk = (disk) => {
     this.setState({
       currentRootDisk: disk

src/modules/resource-disk/modal/CreateFolderModal.jsx

 import React from 'react';
-import { Modal, Input, Form, message } from 'antd';
-import ShowTips from '@/bu-components/ShowTip';
+import { Modal, Input, Form } from 'antd';
 import './CreateFolderModal.less';
 
 class CreateFolderModal extends React.Component {
@@ -107,5 +106,4 @@ class CreateFolderModal extends React.Component {
   }
 }
 
-// export default Form.create()(CreateFolderModal);
 export default CreateFolderModal;
\ No newline at end of file

src/modules/resource-disk/modal/PreviewFileModal.jsx

+import React from 'react';
+import "./PreviewFileModal.less";
+import { Spin } from 'antd'
+class PreviewFileModal extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+  cancelPreView = ()=>{
+    this.props.onCancel();
+  }
+  toPreView = (url)=>{
+    const a = document.createElement('a');
+    document.body.appendChild(a);
+    a.setAttribute('href', url);
+    a.setAttribute('target', '_blank');
+    a.click();
+    document.body.removeChild(a);
+    this.props.onCancel();
+  }
+  render() {
+    const { previewStatus,url} = this.props
+    return (
+        <div className="preview-modal">
+            <div className="preview-modal-content">
+                <div className="load-img-box">
+                {previewStatus === "UPLOAD" && 
+                  <Spin size="large"/>
+                }
+                {previewStatus === "UPLOAD_SUCCESS" && 
+                  <img className="load-img" src="https://image.xiaomaiketang.com/xm/jJRK3bTEdc.png"></img>
+                }
+                </div>
+                <div className="load-text-box">
+                {previewStatus === "UPLOAD" && 
+                  <div className="load-text-box-title">预览生成中</div>
+                }
+                {previewStatus === "UPLOAD_SUCCESS" && 
+                  <div className="load-text-box-title">预览生成成功</div>
+                }
+                </div>
+                <div className="operate">
+                    <span className="btn cancel-preview-btn" onClick={()=>this.cancelPreView()}>取消预览</span>
+                    {previewStatus === "UPLOAD" &&
+                     <span className="btn to-preview-btn__disabled to-preview-btn">去查看</span>
+                    }
+                    {previewStatus === "UPLOAD_SUCCESS" &&
+                     <span className="btn to-preview-btn" onClick={()=>this.toPreView(url)}>去查看</span>
+                    }
+                </div>
+            </div>
+        </div>
+    );
+  }
+}
+
+export default PreviewFileModal;

src/modules/resource-disk/modal/PreviewFileModal.less

+.preview-modal{
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 102;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    .preview-modal-content{
+        position:absolute;
+        left:calc(50% - 133px);
+        top:calc(50% - 87px);
+        color:#FFF;
+        text-align:center;
+        width:266px;
+        height:174px;
+        .ant-spin-dot-item{
+            background-color: #FFF;
+        }
+        .load-img-box{
+            .load-img{
+                width:44px;
+                height:44px;
+            }
+        }
+        .load-text-box{
+            margin-top:23px;
+            font-size:16px;
+            color:#FFF;
+            .load-text-box-title{
+                margin-bottom:8px;
+            }
+        }
+        .operate{
+            margin-top:24px;
+            .btn {
+                padding:5px 12px;
+                border:1px solid #E8E8E8;
+                border-radius:2px;
+            }
+            .cancel-preview-btn{
+                margin-right:8px;
+            }
+            .to-preview-btn__disabled{
+                border:1px solid #E8E8E8;
+                opacity: 0.4;
+                
+            }
+
+        }
+    }
+}
\ No newline at end of file

src/modules/root/App.tsx

@@ -116,7 +116,6 @@ const App: React.FC = (props: any) => {
     setMenuType(!menuType);
   }
 
-
   if (!storeUserId) {
     return <div></div>
   }
@@ -127,7 +126,7 @@ const App: React.FC = (props: any) => {
       <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
         <Main menuType={menuType} />
       </ConfigProvider>
-      <Menu menuType={menuType} handleMenuType={handleMenuType}/>
+      <Menu menuType={menuType} handleMenuType={handleMenuType} />
     </div>
   )
 }

src/modules/root/Header.jsx

@@ -11,6 +11,7 @@ import { Radio, Button, Dropdown, Modal, Tooltip, message } from "antd";
 import { LIVE_SHARE } from "@/domains/course-domain/constants";
 import User from "@/common/js/user";
 import Service from "@/common/js/service";
+import StoreService from "@/domains/store-domain/storeService";
 import BaseService from "@/domains/basic-domain/baseService";
 import { XMContext } from "@/store/context";
 import logoImg from "@/common/images/logo.png";
@@ -18,6 +19,7 @@ import CourseService from "@/domains/course-domain/CourseService";
 import qrcode from "@/libs/qrcode/qrcode.js";
 import Bus from '@/core/tbus';
 import ClickOutside from '../../components/ClickOutside';
+import _ from "underscore";
 
 const baseImg = "https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png";
 const { confirm } = Modal;
@@ -38,6 +40,8 @@ function Header(props) {
   const storeUserId = User.getStoreUserId();
   const enterpriseId = User.getEnterpriseId();
 
+  const messageHelpRef = useRef(null)
+
   const domRef = useRef(null);
   const listRef = useRef(list);
 
@@ -54,6 +58,17 @@ function Header(props) {
     enterpriseId ? getEnterpriseUser() : User.setIsAdmin(false);
   }, [storeUserId]);
 
+  useEffect(()=> {
+    if (!messageHelpRef.current) {
+      return
+    }
+    if (menuType) {
+      messageHelpRef.current.style.marginLeft = "194px"
+    } else {
+      messageHelpRef.current.style.marginLeft = "76px"
+    }
+  },[menuType])
+  
   function getUserInfo() {
     const param = {
       storeUserId: User.getStoreUserId(),
@@ -218,10 +233,10 @@ function Header(props) {
   return (
     <div id="top-container" className="top-container">
       <div className="top top-nav">
-        <div>
-          <img src='https://image.xiaomaiketang.com/xm/WEsMPAYxAs.png' className="logo" alt="" />
-        </div>
-        <div className="message-help">
+        {/* <div>
+          <img src={topLeftLogo} className="logo" alt="" />
+        </div> */}
+        <div className="message-help" ref={messageHelpRef}>
           {list.length ? (
             <ClickOutside
               onClickOutside={() => {

src/modules/root/Menu.less

 @import '../../core/variables.less';
 
-@top-height: 60px;
+@top-height: 0px;
 @menu-bakg: #FFF;
 @active-color: #2966FF;
 .left-container {
@@ -12,6 +12,23 @@
   width: @xm-left-width;
   background: @menu-bakg;
   color: #333;
+  .topLogo {
+    height: 62px;
+    background: rgba(255, 255, 255, 0.5);
+    .img1 {
+      width: 138px;
+      height: 35px;
+      margin-left: 19px;
+      margin-top: 13px;
+    }
+    .img0 {
+      display: none;
+      width: 35px;
+      height: 35px;
+      margin-left: 10px;
+      margin-top: 13px;
+    }
+  }
   .menu-type-icon{
     margin:4px  0 0px 150px;
     cursor: pointer;

src/modules/root/Menu.tsx

-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import {
   withRouter,
 } from 'react-router-dom';
 import { Menu} from 'antd';
 import { menuList } from '../../routes//config/menuList'
 import { XMContext } from '../../store/context';
+import Service from "@/common/js/service";
+import StoreService from "@/domains/store-domain/storeService";
+import User from "@/common/js/user";
 import _ from 'underscore';
 import "./Menu.less";
+console.log('2021-06-17')
 
 const { SubMenu } = Menu;
 function Aside(props: any) {
@@ -14,6 +18,9 @@ function Aside(props: any) {
   const ctx: any = useContext(XMContext);
   const [selectKey, setSelectKey] = useState();
   const [openKeys, setOpenKeys] = useState(['']);
+  const [topLogoUrl, setTopLogoUrl] = useState("")
+  const logoImg0Ref = useRef<any>()
+  const logoImg1Ref = useRef<any>()
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   useEffect(() => {
     const link = props.location.pathname;
@@ -31,6 +38,22 @@ function Aside(props: any) {
       return item;
     })
   }, [props.location.pathname])
+  useEffect(()=> {
+    getTopLeftLogo()
+  })
+  function getTopLeftLogo() {
+    if (User.getToken()) {
+      StoreService.getStoreDetail({storeId:User.getStoreId()})
+      .then(res=> {
+        if (_.isEmpty(res.result.logo)) {
+          setTopLogoUrl("https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png")
+        } else {
+          setTopLogoUrl(res.result.logo)
+        }
+        
+      })
+    }
+  }
   function toggleMenu(item: any) {
     window.RCHistory.push(item.link)
   }
@@ -44,6 +67,23 @@ function Aside(props: any) {
   function handleMenu() {
     handleMenuType();
   }
+  useEffect(()=> {
+    if (!logoImg0Ref.current || !logoImg1Ref.current) {
+      return
+    }
+    if (!menuType) {
+      if (topLogoUrl.indexOf("xiaomaiketang.com") < 0) {
+          logoImg0Ref.current.style.display = "none"
+          logoImg1Ref.current.style.display = "none"
+      } else {
+          logoImg0Ref.current.style.display = "inline"
+          logoImg1Ref.current.style.display = "none"
+      }
+    } else {
+      logoImg0Ref.current.style.display = "none"
+      logoImg1Ref.current.style.display = "inline"
+    }
+  },[menuType])
 
   return (
     <div 
@@ -54,6 +94,10 @@ function Aside(props: any) {
             : "left-container left-container-vertical"
         }
       >
+        <div className="topLogo">
+          <img ref={logoImg0Ref} src="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" alt="" className="img0"></img>
+          <img ref={logoImg1Ref} src={topLogoUrl} alt="" className="img1"></img>
+        </div>
         <div className="menu-type-icon"  onClick={handleMenu}>
           {menuType ? (
             <span

src/modules/teach-tool/components/CourseCategorySiderTree.jsx

 /*
  * @Author: yuananting
  * @Date: 2021-02-22 10:59:43
- * @LastEditors: yuananting
- * @LastEditTime: 2021-04-13 13:55:37
+ * @LastEditors: fusanqiasng
+ * @LastEditTime: 2021-06-15 11:20:48
  * @Description: 助学工具-侧边课程分类树
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
-import React, { Component } from "react";
-import { Input, Button, Tree } from "antd";
-import "./CourseCategorySiderTree.less";
-import User from "@/common/js/user";
-import AidToolService from "@/domains/aid-tool-domain/AidToolService";
-import Bus from "@/core/bus";
+import React, { Component } from 'react';
+import { Input, Button, Tree } from 'antd';
+import './CourseCategorySiderTree.less';
+import User from '@/common/js/user';
+import AidToolService from '@/domains/aid-tool-domain/AidToolService';
+import Bus from '@/core/bus';
 
 const { Search } = Input;
 const { DirectoryTree } = Tree;
@@ -20,31 +20,25 @@ class CourseCategorySiderTree extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKeys: ["QUESTION_INDEX", "PAPER_INDEX"].includes(props.fromModule)
-        ? [getParameterByName("categoryId") || "null"]
-        : ["null"],
+      selectedKeys: ['QUESTION_INDEX', 'PAPER_INDEX'].includes(props.fromModule) ? [getParameterByName('categoryId') || 'null'] : ['null'],
       treeData: props.treeData || [],
       autoExpandParent: false,
     };
   }
 
   componentDidMount() {
-    this.queryCategoryTree("init");
-    Bus.bind("queryCategoryTree", this.queryCategoryTree);
+    this.queryCategoryTree('init');
+    Bus.bind('queryCategoryTree', this.queryCategoryTree);
   }
 
   componentWillUnmount() {
-    Bus.unbind("queryCategoryTree", this.queryCategoryTree);
+    Bus.unbind('queryCategoryTree', this.queryCategoryTree);
   }
 
   // 查询分类树
-  queryCategoryTree = (type = "init", categoryName) => {
+  queryCategoryTree = (type = 'init', categoryName) => {
     let query = {
-      bizType: ["QUESTION_INDEX", "QUESTION_MODAL"].includes(
-        this.props.fromModule
-      )
-        ? "QUESTION"
-        : "PAPER",
+      bizType: ['QUESTION_INDEX', 'QUESTION_MODAL'].includes(this.props.fromModule) ? 'QUESTION' : 'PAPER',
       categoryName,
       count: true,
       source: 0,
@@ -53,7 +47,7 @@ class CourseCategorySiderTree extends Component {
     };
     AidToolService.queryCategoryTree(query).then((res) => {
       const { categoryList = [], noCategoryCnt = 0 } = res.result;
-      let str = "未分类";
+      let str = '未分类';
       if (categoryName) {
         this.setState({ autoExpandParent: true });
         if (str.indexOf(categoryName) < 0) {
@@ -64,15 +58,15 @@ class CourseCategorySiderTree extends Component {
           Object.keys(this.state.treeMap).forEach((item) => {
             nodeId.push(item);
           });
-          if (type === "init") {
+          if (type === 'init') {
             this.setState({ expandedKeys: nodeId });
           }
         } else {
           const defaultNode = {
-            id: "null",
-            categoryName: "未分类",
+            id: 'null',
+            categoryName: '未分类',
             categoryCount: noCategoryCnt,
-            parentId: "0",
+            parentId: '0',
             categoryLevel: 0,
           };
           categoryList.unshift(defaultNode);
@@ -83,24 +77,24 @@ class CourseCategorySiderTree extends Component {
           Object.keys(this.state.treeMap).forEach((item) => {
             nodeId.push(item);
           });
-          if (type === "init") {
+          if (type === 'init') {
             this.setState({ expandedKeys: nodeId });
           }
         }
       } else {
         this.setState({ autoExpandParent: false });
         const defaultNode = {
-          id: "null",
-          categoryName: "未分类",
+          id: 'null',
+          categoryName: '未分类',
           categoryCount: noCategoryCnt,
-          parentId: "0",
+          parentId: '0',
           categoryLevel: 0,
         };
         categoryList.unshift(defaultNode);
         this.setState({
           treeData: this.renderTreeNodes(categoryList, categoryName),
         });
-        if (type === "init") {
+        if (type === 'init') {
           this.setState({ expandedKeys: [] });
         }
       }
@@ -126,12 +120,12 @@ class CourseCategorySiderTree extends Component {
   // 树状选中事件
   onSelect = (selectedKeys) => {
     this.setState({ selectedKeys }, () => {
-      if (this.props.fromModule === "QUESTION_INDEX") {
-        Bus.trigger("queryQuestionPageList", selectedKeys[0]);
-      } else if (this.props.fromModule === "QUESTION_MODAL") {
-        Bus.trigger("queryQuestionPageListWithContent", selectedKeys[0]);
+      if (this.props.fromModule === 'QUESTION_INDEX') {
+        Bus.trigger('queryQuestionPageList', selectedKeys[0]);
+      } else if (this.props.fromModule === 'QUESTION_MODAL') {
+        Bus.trigger('queryQuestionPageListWithContent', selectedKeys[0]);
       } else {
-        Bus.trigger("queryPaperPageList", selectedKeys[0], 0);
+        Bus.trigger('queryPaperPageList', selectedKeys[0], 0);
       }
     });
   };
@@ -144,39 +138,35 @@ class CourseCategorySiderTree extends Component {
       item.title =
         !value || (value && item.categoryName.indexOf(value) > -1) ? (
           <span>
-            {item.categoryName}（{item.categoryCount}）
+            {item.categoryName}
+            {item.categoryCount > 0 && <span>（{item.categoryCount}）</span>}
           </span>
         ) : (
           <span style={{ opacity: 0.5 }}>
-            {item.categoryName}（{item.categoryCount}）
+            {item.categoryName}
+            {item.categoryCount > 0 && <span>（{item.categoryCount}）</span>}
           </span>
         );
       item.icon =
-        item.categoryName === "未分类" ? (
+        item.categoryName === '未分类' ? (
           <img
             style={{
-              width: "24px",
-              height: "24px",
-              opacity:
-                !value || (value && item.categoryName.indexOf(value) > -1)
-                  ? 1
-                  : 0.5,
+              width: '24px',
+              height: '24px',
+              opacity: !value || (value && item.categoryName.indexOf(value) > -1) ? 1 : 0.5,
             }}
-            src="https://image.xiaomaiketang.com/xm/defaultCategory.png"
-            alt=""
+            src='https://image.xiaomaiketang.com/xm/defaultCategory.png'
+            alt=''
           />
         ) : (
           <img
             style={{
-              width: "24px",
-              height: "24px",
-              opacity:
-                !value || (value && item.categoryName.indexOf(value) > -1)
-                  ? 1
-                  : 0.5,
+              width: '24px',
+              height: '24px',
+              opacity: !value || (value && item.categoryName.indexOf(value) > -1) ? 1 : 0.5,
             }}
-            src="https://image.xiaomaiketang.com/xm/hasCategory.png"
-            alt=""
+            src='https://image.xiaomaiketang.com/xm/hasCategory.png'
+            alt=''
           />
         );
       if (item.sonCategoryList) {
@@ -190,46 +180,34 @@ class CourseCategorySiderTree extends Component {
   };
 
   render() {
-    const {
-      treeData,
-      expandedKeys,
-      selectedKeys,
-      autoExpandParent,
-    } = this.state;
+    const { treeData, expandedKeys, selectedKeys, autoExpandParent } = this.state;
 
     return (
-      <div className="category-tree-sider">
-        {["QUESTION_INDEX", "PAPER_INDEX"].includes(this.props.fromModule) && (
-          <div className="sider-title">
-            {this.props.fromModule === "QUESTION_INDEX"
-              ? "题目分类"
-              : "试卷分类"}
-          </div>
+      <div className='category-tree-sider'>
+        {['QUESTION_INDEX', 'PAPER_INDEX'].includes(this.props.fromModule) && (
+          <div className='sider-title'>{this.props.fromModule === 'QUESTION_INDEX' ? '题目分类' : '试卷分类'}</div>
         )}
         <Search
-          className="sider-search"
-          placeholder="搜索名称分类"
+          className='sider-search'
+          placeholder='搜索名称分类'
           onSearch={(value) => {
-            this.queryCategoryTree("init", value);
+            this.queryCategoryTree('init', value);
           }}
-          enterButton={<span className="icon iconfont">&#xe832;</span>}
+          enterButton={<span className='icon iconfont'>&#xe832;</span>}
         />
-        {["QUESTION_INDEX", "PAPER_INDEX"].includes(this.props.fromModule) &&
-          User.getUserRole() !== "CloudLecturer" &&
-          this.props.type !== "modal-select" && (
-            <div className="sider-btn">
+        {['QUESTION_INDEX', 'PAPER_INDEX'].includes(this.props.fromModule) && User.getUserRole() !== 'CloudLecturer' && this.props.type !== 'modal-select' && (
+          <div className='sider-btn'>
             <Button
               onClick={() => {
                 window.RCHistory.push({
-                    pathname: "/course-category-manage?from=aid",
+                  pathname: '/course-category-manage?from=aid',
                 });
-                }}
-              >
+              }}>
               分类管理
             </Button>
           </div>
         )}
-        <div className="sider-tree">
+        <div className='sider-tree'>
           <DirectoryTree
             expandedKeys={expandedKeys}
             autoExpandParent={autoExpandParent}

src/modules/teach-tool/examination-manager/ExamShareModal.jsx

 import React from 'react';
-import { Modal, Button, message } from 'antd';
+import { Modal, message } from 'antd';
 import html2canvas from 'html2canvas';
 import User from "../../../common/js/user";
 import QRCode from '../../../libs/qrcode/qrcode';
@@ -27,7 +27,6 @@ class ExamShareModal extends React.Component {
 
     handleConvertShortUrl = () => {
         const longUrl = `${LIVE_SHARE}test_detail/${this.props.data.examId}?id=${User.getStoreId()}`
-        console.log(longUrl)
         // 发请求
         Service.Sales('public/businessShow/convertShortUrls', {
             urls: [longUrl]