Commit 97f90044 by wufan

style:直播分享样式优化

parent e9517148
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0", "@typescript-eslint/parser": "^2.10.0",
"ali-oss": "^6.12.0", "ali-oss": "^6.12.0",
"antd": "^4.8.5", "antd": "^4.9.4",
"array-move": "^3.0.1", "array-move": "^3.0.1",
"axios": "^0.20.0", "axios": "^0.20.0",
"babel-eslint": "10.1.0", "babel-eslint": "10.1.0",
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"typescript": "^4.0.2", "typescript": "^4.0.2",
"underscore": "^1.10.2", "underscore": "^1.10.2",
"url-loader": "2.3.0", "url-loader": "2.3.0",
"video-react": "^0.14.1", "video-react": "0.14.1",
"wangeditor": "^3.1.1", "wangeditor": "^3.1.1",
"webpack": "4.42.0", "webpack": "4.42.0",
"webpack-dev-server": "3.11.0", "webpack-dev-server": "3.11.0",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-04-27 20:35:34 * @Date: 2020-04-27 20:35:34
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-23 15:26:04 * @LastEditTime: 2020-12-23 19:38:35
* @Description: * @Description:
*/ */
...@@ -15,6 +15,7 @@ import zh_CN from 'antd/es/locale/zh_CN'; ...@@ -15,6 +15,7 @@ import zh_CN from 'antd/es/locale/zh_CN';
import _ from 'underscore'; import _ from 'underscore';
import { RootRouter } from './routes/index'; import { RootRouter } from './routes/index';
import 'antd/dist/antd.less'; import 'antd/dist/antd.less';
import 'video-react/dist/video-react.css';
import '@/common/less/index.less'; import '@/common/less/index.less';
import '@/core/function'; import '@/core/function';
......
...@@ -110,7 +110,8 @@ class ShareLiveModal extends React.Component { ...@@ -110,7 +110,8 @@ class ShareLiveModal extends React.Component {
<span className="text">{storeName}</span> <span className="text">{storeName}</span>
</div> </div>
<div className="course-name">{type === 'videoClass' ? `${courseName}开课啦`: `邀请你观看直播:《${courseName}》`}</div> <div className="course-name-title">{type === 'videoClass' ? `${courseName}开课啦`: `邀请你观看直播:`}</div>
<div className="course-name">{courseName}</div>
<img <img
src={coverImgSrc} src={coverImgSrc}
crossOrigin="*" crossOrigin="*"
......
...@@ -8,11 +8,16 @@ ...@@ -8,11 +8,16 @@
margin: 0 32px 0 16px; margin: 0 32px 0 16px;
box-shadow:0px 2px 10px 0px rgba(0,0,0,0.05); box-shadow:0px 2px 10px 0px rgba(0,0,0,0.05);
border-radius: 12px; border-radius: 12px;
.course-name-title {
font-size: 14px;
color: #333;
line-height: 20px;
margin-bottom: 4px;
}
.course-name { .course-name {
color: #333; color: #333;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 600;
line-height: 20px; line-height: 20px;
} }
......
...@@ -567,7 +567,6 @@ class FolderList extends React.Component { ...@@ -567,7 +567,6 @@ class FolderList extends React.Component {
const { currentRootDisk } = this.props; const { currentRootDisk } = this.props;
// 是否有编辑权限 // 是否有编辑权限
const hasManagementAuthority = currentRootDisk.uploadPower; const hasManagementAuthority = currentRootDisk.uploadPower;
console.log("hasManagementAuthority",hasManagementAuthority,record.rights);
// 公共文件权限和复制权限 // 公共文件权限和复制权限
const { folderType, rights } = record; const { folderType, rights } = record;
const menu = ( const menu = (
......
...@@ -119,7 +119,6 @@ class FolderManage extends React.Component { ...@@ -119,7 +119,6 @@ class FolderManage extends React.Component {
_records.push(item); _records.push(item);
return _records; return _records;
}) })
console.log("records---",records,_records);
this.setState({ this.setState({
loading: false, loading: false,
folderList: _records, folderList: _records,
...@@ -137,7 +136,6 @@ class FolderManage extends React.Component { ...@@ -137,7 +136,6 @@ class FolderManage extends React.Component {
}); });
} }
}).catch((error)=>{ }).catch((error)=>{
console.log("error-----",error)
this.setState({ this.setState({
loading: false, loading: false,
}) })
...@@ -339,7 +337,6 @@ class FolderManage extends React.Component { ...@@ -339,7 +337,6 @@ class FolderManage extends React.Component {
} = this.state; } = this.state;
const { currentRootDisk } = this.props; const { currentRootDisk } = this.props;
console.log("folderList",folderList);
return ( return (
<Spin spinning={loading} style={{width: '100%'}}> <Spin spinning={loading} style={{width: '100%'}}>
<div className="folder-manage"> <div className="folder-manage">
......
...@@ -23,7 +23,6 @@ class ScanFileModal extends React.Component { ...@@ -23,7 +23,6 @@ class ScanFileModal extends React.Component {
title="查看文件" title="查看文件"
footer={null} footer={null}
width={680} width={680}
maskClosable={false}
className="scan-file-modal" className="scan-file-modal"
> >
<div className="scan-file-modal" style={{ width: 632 }}> <div className="scan-file-modal" style={{ width: 632 }}>
......
...@@ -56,19 +56,7 @@ ...@@ -56,19 +56,7 @@
cursor: pointer; cursor: pointer;
} }
} }
// .row-dragging {
// background: #fafafa;
// border: 1px solid #ccc;
// }
// .row-dragging td {
// padding: 16px;
// visibility: hidden;
// }
// .row-dragging .drag-visible {
// visibility: visible;
// }
} }
.clip-box { .clip-box {
display: flex; display: flex;
...@@ -98,3 +86,16 @@ ...@@ -98,3 +86,16 @@
} }
} }
} }
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
visibility: hidden;
}
.row-dragging .drag-visible {
visibility: visible;
}
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-23 15:14:33 * @LastEditTime: 2020-12-23 20:26:34
* @Description: web店铺banner页面 * @Description: web店铺banner页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment