Merge branch 'feature/maolipeng/youhua' into dev

# Conflicts:
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/course-manage/offline-course/components/OfflineCourseList.jsx

src/bu-components/ChooseMembersModal.jsx

@@ -205,10 +205,9 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         key: 'avatar',
         dataIndex: 'avatar',
         dataIndex: 'avatar',
-        width: '40%',
+        width: '30%',
         render: (value, record) => {
         render: (value, record) => {
           const { adminName } = record;
           const { adminName } = record;
-
           return (
           return (
             <div className='avatar'>
             <div className='avatar'>
               {
               {
@@ -234,7 +233,7 @@ class ChooseMembersModal extends React.Component {
         title: '学员名',
         title: '学员名',
         key: 'adminNameRight',
         key: 'adminNameRight',
         dataIndex: 'adminName',
         dataIndex: 'adminName',
-        width: '70%',
+        width: '65%',
         render: (value, record) => {
         render: (value, record) => {
           const { adminName = '', avatar } = record;
           const { adminName = '', avatar } = record;
           return (
           return (

src/bu-components/ChooseMembersModal.less

@@ -37,7 +37,7 @@
             >tr >td {
             >tr >td {
               border-bottom: none;
               border-bottom: none;
               background-color: #fff !important;
               background-color: #fff !important;
-
+              padding:8px 8px !important;
             }
             }
           }
           }
         }
         }

src/bu-components/ManagingMembersModal.less

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

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

-
+/*
+ * @Author: 吴文洁
+ * @Date: 2020-08-05 10:12:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-06-15 20:01:05
+ * @Description: 视频课-列表模块
+ * @Copyright: 杭州杰竞科技有限公司 版权所有
+ */
 import React from 'react';
 import React from 'react';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
 
 

src/modules/course-manage/offline-course/components/OfflineCourseList.jsx

-
 import React from 'react';
 import React from 'react';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
 import { Route, withRouter } from 'react-router-dom';
 import { Route, withRouter } from 'react-router-dom';

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

@@ -162,7 +162,7 @@ class FolderList extends React.Component {
     const {currentRootDisk } = this.props;
     const {currentRootDisk } = this.props;
     //如果是公共文件且只有查看的权限的用户的预览对接的三方是永中
     //如果是公共文件且只有查看的权限的用户的预览对接的三方是永中
     const that = this;
     const that = this;
-    if(currentRootDisk.disk==="COMMON"){
+    if(currentRootDisk.disk==="COMMON" && rights==="LOOK"){
       switch (folderFormat) {
       switch (folderFormat) {
         case 'PDF':
         case 'PDF':
         case 'WORD':
         case 'WORD':

src/modules/root/Menu.less

@@ -14,12 +14,20 @@
   color: #333;
   color: #333;
   .topLogo {
   .topLogo {
     height: 62px;
     height: 62px;
-    img {
+    background: rgba(255, 255, 255, 0.5);
+    .img1 {
       width: 138px;
       width: 138px;
       height: 35px;
       height: 35px;
       margin-left: 19px;
       margin-left: 19px;
       margin-top: 13px;
       margin-top: 13px;
     }
     }
+    .img0 {
+      display: none;
+      width: 35px;
+      height: 35px;
+      margin-left: 10px;
+      margin-top: 13px;
+    }
   }
   }
   .menu-type-icon{
   .menu-type-icon{
     margin:4px  0 0px 150px;
     margin:4px  0 0px 150px;

src/modules/root/Menu.tsx

-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import {
 import {
   withRouter,
   withRouter,
 } from 'react-router-dom';
 } from 'react-router-dom';
@@ -18,6 +18,8 @@ function Aside(props: any) {
   const [selectKey, setSelectKey] = useState();
   const [selectKey, setSelectKey] = useState();
   const [openKeys, setOpenKeys] = useState(['']);
   const [openKeys, setOpenKeys] = useState(['']);
   const [topLogoUrl, setTopLogoUrl] = useState("")
   const [topLogoUrl, setTopLogoUrl] = useState("")
+  const logoImg0Ref = useRef<any>()
+  const logoImg1Ref = useRef<any>()
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   useEffect(() => {
   useEffect(() => {
     const link = props.location.pathname;
     const link = props.location.pathname;
@@ -57,8 +59,26 @@ function Aside(props: any) {
     }
     }
   }
   }
   function handleMenu() {
   function handleMenu() {
+    
     handleMenuType();
     handleMenuType();
   }
   }
+  useEffect(()=> {
+    if (!logoImg0Ref.current || !logoImg1Ref.current) {
+      return
+    }
+    if (!menuType) {
+      if (topLogoUrl.indexOf("xiaomaiketang.com") < 0 && topLogoUrl.indexOf("qlogo.cn") < 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 (
   return (
     <div 
     <div 
@@ -70,8 +90,8 @@ function Aside(props: any) {
         }
         }
       >
       >
         <div className="topLogo">
         <div className="topLogo">
-          { menuType ? (<img src={topLogoUrl} alt=""></img>) : ("")}
-          
+          <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>
         <div className="menu-type-icon"  onClick={handleMenu}>
         <div className="menu-type-icon"  onClick={handleMenu}>
           {menuType ? (
           {menuType ? (