Commit 51f670df by wufan

style:layout布局统一

parent 8cdfd96a
......@@ -98,7 +98,6 @@ class SelectPrepareFileModal extends React.Component {
// 根据当前根节点获取文件列表
const { selectType } = this.props;
const { query, folderList, currentRootDisk } = this.state;
const { instId } = window.currentUserInstInfo;
const _params = {
...query,
...params,
......@@ -324,21 +323,7 @@ class SelectPrepareFileModal extends React.Component {
const _fileList = [...fileList];
_fileList.map((file, index) => {
let { size, type, name } = file;
// if (!type) {
// type = getFileTypeByName(name);
// }
// if (type.indexOf('image') > -1 && size > 5 * DEFAULT_SIZE_UNIT) {
// nonCompliantFileList.push(file);
// _fileList.splice(index, 1);
// }
// if (type.indexOf('audio') > -1 && size > 20 * DEFAULT_SIZE_UNIT) {
// nonCompliantFileList.push(file);
// _fileList.splice(index, 1);
// }
// if (type.indexOf('video') > -1 && size > 500 * DEFAULT_SIZE_UNIT) {
// nonCompliantFileList.push(file);
// _fileList.splice(index, 1);
// }
if (localFileTypeMap.indexOf(type) > -1 && size > FileVerifyMap[type].maxSize * DEFAULT_SIZE_UNIT) {
nonCompliantFileList.push(file);
_fileList.splice(index, 1);
......@@ -386,7 +371,6 @@ class SelectPrepareFileModal extends React.Component {
const { folderPathList, currentRootDisk, uploadFolderPath } = this.state;
const { scene } = this.props;
const { teacherId, instId } = window.currentUserInstInfo;
const currentFolder = folderPathList[folderPathList.length - 1];
const { id = null } = uploadFolderPath || currentFolder;
let { size, type, name } = file;
......@@ -395,17 +379,6 @@ class SelectPrepareFileModal extends React.Component {
type = getFileTypeByName(name)
}
// const params = {
// name,
// resourceId,
// folderSize: size,
// folderFormat: type,
// folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
// disk: currentRootDisk.disk,
// instId: instId,
// createUser: teacherId ? "TEACHER" : "ADMIN",
// parentId: id
// }
const params = {
name,
resourceId,
......
......@@ -2,7 +2,7 @@
@import './antd.less';
.page {
position: absolute;
position: relative;
top: 0px;
left: 0px;
right: 0;
......@@ -96,7 +96,7 @@
margin: 8px 16px;
}
&:last-child{
margin-bottom: 16px;
margin-bottom: 13px;
}
}
......
.personal-info-page{
.page-content{
.box{
padding: 60px 60px 60px 40px !important;
}
......@@ -58,5 +57,4 @@
margin-left:20px;
}
}
}
}
\ No newline at end of file
......@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: wufan
* @LastEditTime: 2021-01-18 21:22:16
* @LastEditTime: 2021-02-01 14:34:44
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -123,7 +123,6 @@ function PersonalInfoPage() {
console.log('User.getStoreType()',User.getStoreType());
return (
<div className="page personal-info-page">
<div className="page-content">
<div className="content-header">个人设置</div>
<div className="box">
<Form>
......@@ -212,7 +211,6 @@ console.log('User.getStoreType()',User.getStoreType());
onConfirm={changePhoneConfirm}
/>
)}
</div>
</div>
);
}
......
......@@ -164,7 +164,6 @@ function CourseCatalogPage() {
return (
<div className=" page course-catalog-page">
<div className="page-content">
<div className="content-header">课程分类</div>
<div className="box">
<div className="box-header">
......@@ -215,7 +214,6 @@ function CourseCatalogPage() {
{
secondCatalogModalVisible && <SecondCatalogAddOrEditModal modalType={secondCatalogModalType} parentId={parentCatalogId} parentName={parentCatalogName} onClose={()=>{setSecondCatalogModalVisible(false)}} choosedItem={choosedItem} refreshCatalogList={getCourseCatalogList} />
}
</div>
</div>
);
}
......
......@@ -305,7 +305,6 @@ function EmployeesManagePage() {
return (
<div className=" page employee-manage-page">
<div className="page-content">
<div className="content-header">员工管理</div>
<div className="box">
<div className="box-header">
......@@ -428,7 +427,6 @@ function EmployeesManagePage() {
</div>
</div>
{model}
</div>
</div>
);
}
......
......@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2021-01-09 15:59:32
* @LastEditTime: 2021-02-01 14:12:38
* @Description: 店铺装修页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -31,7 +31,6 @@ function StoreDecorationPage(props: StoreDecoprationProps) {
return (
<div className="page store-decoration-page">
<div className="page-content">
<div className="content-header">店铺装修</div>
<div className="box">
<Tabs
......@@ -53,7 +52,6 @@ function StoreDecorationPage(props: StoreDecoprationProps) {
}
</div>
</div>
</div>
);
}
......
......@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2020-12-14 19:49:52
* @LastEditTime: 2021-02-01 14:12:55
* @Description: 用户管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -81,7 +81,6 @@ function UserManagePage() {
return (
<div className=" page user-manage-page">
<div className="page-content">
<div className="content-header">用户管理</div>
<div className="box">
<div className="box-header">
......@@ -168,7 +167,6 @@ function UserManagePage() {
/>
</div>
</div>
</div>
</div>
);
}
......
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