Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
8121b9fb
Commit
8121b9fb
authored
Nov 05, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into test
parents
7cea8703
152e7597
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
227 additions
and
4 deletions
+227
-4
authConfigRoute.ts
config/routes/authConfigRoute.ts
+7
-1
index.ts
config/routes/index.ts
+1
-0
menu.ts
src/locales/zh-CN/menu.ts
+2
-0
basicInfoForm.tsx
...ages/commodity/products/addProductsItem/basicInfoForm.tsx
+2
-1
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+1
-2
index.less
src/pages/home/index.less
+43
-0
index.tsx
src/pages/home/index.tsx
+53
-0
index.less
src/pages/systemSetting/message/index.less
+19
-0
index.tsx
src/pages/systemSetting/message/index.tsx
+99
-0
No files found.
config/routes/authConfigRoute.ts
View file @
8121b9fb
...
...
@@ -119,7 +119,13 @@ const AuthConfigRoute: RouterChild = {
component
:
'@/pages/accountSetting/editAccount'
,
hideInMenu
:
true
,
},
//
//消息中心
{
path
:
'/memberCenter/systemSetting/message'
,
name
:
'message'
,
component
:
'@/pages/systemSetting/message'
},
],
}
...
...
config/routes/index.ts
View file @
8121b9fb
...
...
@@ -39,6 +39,7 @@ const memberCenterRoute = {
icon
:
'smile'
,
key
:
'home'
,
component
:
'@/pages/index'
,
// component: '@/pages/home',
},
...
routes
,
{
...
...
src/locales/zh-CN/menu.ts
View file @
8121b9fb
...
...
@@ -451,6 +451,8 @@ export default {
'menu.systemSetting.accountSetting'
:
'账号安全设置'
,
'menu.systemSetting.editAccount'
:
'编辑账号信息'
,
'menu.systemSetting.message'
:
'消息中心'
,
// 加工能力, assign 指的是 指派生产通知单
'menu.handling'
:
'加工'
,
'menu.handling.assign'
:
'指派生产通知单'
,
...
...
src/pages/commodity/products/addProductsItem/basicInfoForm.tsx
View file @
8121b9fb
...
...
@@ -227,7 +227,8 @@ const BasicInfoForm: React.FC<Iprops> = (props) => {
>
<
Cascader
allowClear=
{
false
}
disabled=
{
!
isUpdateAttribute
}
// disabled={!isUpdateAttribute}
disabled=
{
history
.
location
.
query
?.
id
}
options=
{
customerCategoryTree
}
fieldNames=
{
{
label
:
'title'
,
value
:
'id'
,
children
:
'children'
}
}
onChange=
{
onCustomerCategoryChange
}
...
...
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
8121b9fb
...
...
@@ -551,7 +551,6 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
// 校验阶梯范围
const
validatorNumberRange
=
(
rule
,
value
,
callback
)
=>
{
console
.
log
(
value
,
'v'
)
try
{
if
(
Array
.
isArray
(
value
)){
let
range
=
value
.
map
(
item
=>
{
...
...
@@ -563,7 +562,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
},
[]
)
let
result
=
range
.
reduce
((
a
,
b
)
=>
{
if
(
a
<
b
)
return
b
})
let
result
=
range
.
map
(
Number
).
reduce
((
a
,
b
)
=>
{
if
(
a
<
b
)
return
b
})
if
(
!
result
)
throw
new
Error
(
'请正确输入阶梯数量范围'
);
if
(
range
[
0
]
!==
minOrderNumber
)
throw
new
Error
(
'阶段的起始值必须为最小起订数'
);
callback
()
...
...
src/pages/home/index.less
0 → 100644
View file @
8121b9fb
.homeGuide{
background-color: @main-color;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
height: 90px;
color: white;
.gridStyle{
display: flex;
flex: 1;
justify-content: space-between;
align-items: center;
border-right: 1px solid rgba(255, 255, 255, 0.2);
height: 90px;
p{
font-size: 12px;
font-weight: 400;
margin-left: 24px;
}
.guideTitle{
font-size: 14px;
font-weight: 400;
}
.guideDesc{
}
.guideIcon{
font-size: 14px;
margin-right: 27px;
}
.guideIconFirst{
font-size: 24px;
}
}
.gridStyleFirst{
flex: 0 0 16%;
}
.gridStyleLast{
}
}
\ No newline at end of file
src/pages/home/index.tsx
0 → 100644
View file @
8121b9fb
import
React
,
{
useState
,
useEffect
}
from
'react'
import
{
Button
,
Card
,
Space
,
Radio
,
Row
,
Col
,
Table
,
Tabs
,
Tag
,
Avatar
,
Image
,
List
,
Badge
}
from
'antd'
import
cx
from
'classnames'
import
styles
from
'./index.less'
import
StatusTag
from
'@/components/StatusTag'
import
{
CaretUpOutlined
,
CompassFilled
,
CompassOutlined
,
RightCircleFilled
,
RightOutlined
,
UpOutlined
}
from
'@ant-design/icons'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
const
Home
:
React
.
FC
<
{}
>
=
()
=>
{
return
(
<
PageHeaderWrapper
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Row
>
<
Col
span=
{
24
}
>
<
div
className=
{
styles
.
homeGuide
}
>
<
div
className=
{
cx
(
styles
.
gridStyle
,
styles
.
gridStyleFirst
)
}
>
<
p
>
<
CompassFilled
className=
{
styles
.
guideIconFirst
}
/>
<
span
>
使用向导
</
span
>
</
p
>
</
div
>
<
div
className=
{
styles
.
gridStyle
}
>
<
div
>
<
p
className=
{
styles
.
guideTitle
}
>
1.新建商品
</
p
>
<
p
className=
{
styles
.
guideDesc
}
>
三分钟智能化,完成商品创建
</
p
>
</
div
>
<
UpOutlined
className=
{
styles
.
guideIcon
}
/>
</
div
>
<
div
className=
{
styles
.
gridStyle
}
>
<
div
>
<
p
className=
{
styles
.
guideTitle
}
>
1.新建商品
</
p
>
<
p
className=
{
styles
.
guideDesc
}
>
三分钟智能化,完成商品创建
</
p
>
</
div
>
<
UpOutlined
className=
{
styles
.
guideIcon
}
/>
</
div
>
<
div
className=
{
cx
(
styles
.
gridStyle
,
styles
.
gridStyleLast
)
}
>
<
div
>
<
p
className=
{
styles
.
guideTitle
}
>
1.新建商品
</
p
>
<
p
className=
{
styles
.
guideDesc
}
>
三分钟智能化,完成商品创建
</
p
>
</
div
>
<
UpOutlined
className=
{
styles
.
guideIcon
}
/>
</
div
>
</
div
>
</
Col
>
</
Row
>
</
Space
>
</
PageHeaderWrapper
>
)
}
export
default
Home
src/pages/systemSetting/message/index.less
0 → 100644
View file @
8121b9fb
.customList{
:global{
.ant-list-item-meta{
align-items: center;
}
}
.messageText{
font-size: 14px;
font-weight: 400;
color: #606266;
}
.messageTitle{
margin: 0 30px;
font-size: 14px;
font-weight: 500;
color: #303133;
}
}
\ No newline at end of file
src/pages/systemSetting/message/index.tsx
0 → 100644
View file @
8121b9fb
import
React
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
Row
,
Col
,
Card
,
List
,
Avatar
}
from
'antd'
;
import
styles
from
'./index.less'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
PlusOutlined
}
from
'@ant-design/icons'
;
import
StatusTag
from
'@/components/StatusTag'
;
const
Message
:
React
.
FC
<
{}
>
=
()
=>
{
const
data
=
[
{
id
:
1
,
icon
:
''
,
status
:
'success'
,
type
:
'系统消息'
,
title
:
'订单发货'
,
message
:
'订单发货,请注意查收,清单发货,请注意查收!'
,
time
:
'2015-15-05'
,
},
{
id
:
2
,
icon
:
''
,
status
:
'success'
,
type
:
'系统消息'
,
title
:
'订单收货'
,
message
:
'订单发货,请注意查收,清单发货,请注意查收!'
,
time
:
'2015-15-05'
,
},
{
id
:
3
,
icon
:
''
,
status
:
'primary'
,
type
:
'系统消息'
,
title
:
'系统消息'
,
message
:
'账户异常,请注意账户资金安全!'
,
time
:
'2015-15-05'
,
},
{
id
:
4
,
icon
:
''
,
status
:
'primary'
,
type
:
'系统消息'
,
title
:
'系统消息'
,
message
:
'账户支出300元,请注意账户资金安全!'
,
time
:
'2015-15-05'
,
},
];
const
renderMessage
=
(
data
)
=>
{
return
(
<>
<
StatusTag
type=
{
data
.
status
}
title=
{
data
.
type
}
/>
<
span
className=
{
styles
.
messageTitle
}
>
{
data
.
title
}
</
span
>
<
span
className=
{
styles
.
messageText
}
>
{
data
.
message
}
</
span
>
</>
)
}
const
showTotal
=
(
total
)
=>
{
return
`共
${
total
}
条`
;
}
return
(
<
PageHeaderWrapper
>
<
Card
title=
"消息列表"
>
<
List
itemLayout=
"horizontal"
dataSource=
{
data
}
className=
{
styles
.
customList
}
pagination=
{
{
onChange
:
page
=>
{
console
.
log
(
page
);
},
pageSize
:
10
,
size
:
"small"
,
showQuickJumper
:
true
,
total
:
4
,
showTotal
:
showTotal
}
}
renderItem=
{
item
=>
(
<
List
.
Item
>
<
List
.
Item
.
Meta
avatar=
{
<
Avatar
src=
{
item
.
icon
}
/>
}
title=
{
renderMessage
(
item
)
}
/>
<
div
>
{
item
.
time
}
</
div
>
</
List
.
Item
>
)
}
/>
</
Card
>
</
PageHeaderWrapper
>
)
}
export
default
Message
;
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