Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
51f670df
Commit
51f670df
authored
Feb 01, 2021
by
wufan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style:layout布局统一
parent
8cdfd96a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
6 additions
and
46 deletions
+6
-46
src/bu-components/SelectPrepareFileModal.jsx
+1
-28
src/core/page.less
+2
-2
src/modules/personalInfo/index.less
+0
-3
src/modules/personalInfo/index.tsx
+1
-3
src/modules/store-manage/CourseCatalogPage.tsx
+0
-2
src/modules/store-manage/EmployeesManagePage.tsx
+0
-2
src/modules/store-manage/StoreDecorationPage.tsx
+1
-3
src/modules/store-manage/UserManagePage.tsx
+1
-3
No files found.
src/bu-components/SelectPrepareFileModal.jsx
View file @
51f670df
...
...
@@ -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
,
...
...
src/core/page.less
View file @
51f670df
...
...
@@ -2,7 +2,7 @@
@import './antd.less';
.page {
position:
absolut
e;
position:
relativ
e;
top: 0px;
left: 0px;
right: 0;
...
...
@@ -96,7 +96,7 @@
margin: 8px 16px;
}
&:last-child{
margin-bottom: 1
6
px;
margin-bottom: 1
3
px;
}
}
...
...
src/modules/personalInfo/index.less
View file @
51f670df
.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
src/modules/personalInfo/index.tsx
View file @
51f670df
...
...
@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: wufan
* @LastEditTime: 2021-0
1-18 21:22:16
* @LastEditTime: 2021-0
2-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
>
);
}
...
...
src/modules/store-manage/CourseCatalogPage.tsx
View file @
51f670df
...
...
@@ -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
>
);
}
...
...
src/modules/store-manage/EmployeesManagePage.tsx
View file @
51f670df
...
...
@@ -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
>
);
}
...
...
src/modules/store-manage/StoreDecorationPage.tsx
View file @
51f670df
...
...
@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2021-0
1-09 15:59:32
* @LastEditTime: 2021-0
2-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
>
);
}
...
...
src/modules/store-manage/UserManagePage.tsx
View file @
51f670df
...
...
@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 202
0-12-14 19:49:52
* @LastEditTime: 202
1-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
>
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment