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
b72de57e
Commit
b72de57e
authored
Dec 17, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理订单详情内部状态显示异常,处理销售待审核订单修改运费后价格总计价格不同步更新的问题
parent
840c58e1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
61 deletions
+60
-61
index.tsx
src/pages/transaction/components/OrderDetailHeader/index.tsx
+60
-61
index.tsx
...es/transaction/components/saleOrderProductTable/index.tsx
+0
-0
No files found.
src/pages/transaction/components/OrderDetailHeader/index.tsx
View file @
b72de57e
import
React
,
{
ReactNode
}
from
'react'
import
{
Row
,
Col
,
Skeleton
}
from
'antd'
import
{
history
}
from
'umi'
import
{
ArrowLeftOutlined
}
from
'@ant-design/icons'
import
style
from
'./index.less'
export
interface
OrderDetailHeaderProps
{
extraRight
?:
ReactNode
,
detailList
?:
{
label
:
string
,
name
:
string
,
render
?(
text
,
record
?),
[
key
:
string
]:
any
}[],
detailData
?:
any
}
/**
* 订单详情头部
*/
const
OrderDetailHeader
:
React
.
FC
<
OrderDetailHeaderProps
>
=
({
extraRight
,
detailList
=
[],
detailData
})
=>
{
const
isLoading
=
!!
detailData
return
(
<
div
className=
{
style
.
detailHeader
}
>
{
isLoading
?
<
Row
>
{
<
Col
>
<
Row
align=
'middle'
>
<
Col
>
<
ArrowLeftOutlined
onClick=
{
()
=>
history
.
goBack
()
}
/>
</
Col
>
<
Col
className=
{
style
.
titleAvator
}
>
单
</
Col
>
</
Row
>
</
Col
>
}
<
Col
style=
{
{
flex
:
1
}
}
>
<
Row
justify=
'space-between'
align=
'middle'
style=
{
{
paddingTop
:
14
}
}
>
<
Col
style=
{
{
flex
:
1
}
}
>
<
div
className=
{
style
.
titleAvatorText
}
>
订单号:
{
detailData
.
orderNo
}
</
div
>
<
Row
>
{
detailList
.
map
(
v
=>
{
const
{
label
,
render
,
name
,
...
colProps
}
=
v
return
detailData
[
name
]
?
<
Col
key=
{
label
}
{
...
colProps
}
className=
{
style
.
detailCol
}
>
<
span
className=
{
style
.
colLabel
}
>
{
label
}
:
</
span
>
{
render
?
render
(
detailData
[
name
],
detailData
)
:
<
span
>
{
detailData
[
name
]
}
</
span
>
}
</
Col
>
:
null
})
}
</
Row
>
</
Col
>
<
Col
>
{
extraRight
}
</
Col
>
</
Row
>
</
Col
>
</
Row
>
:
<
Skeleton
avatar=
{
{
shape
:
'square'
}
}
active
paragraph=
{
{
rows
:
3
}
}
/>
}
</
div
>
)
}
OrderDetailHeader
.
defaultProps
=
{}
export
default
OrderDetailHeader
\ No newline at end of file
import
React
,
{
ReactNode
}
from
'react'
import
{
Row
,
Col
,
Skeleton
}
from
'antd'
import
{
history
}
from
'umi'
import
{
ArrowLeftOutlined
}
from
'@ant-design/icons'
import
style
from
'./index.less'
export
interface
OrderDetailHeaderProps
{
extraRight
?:
ReactNode
,
detailList
?:
{
label
:
string
,
name
:
string
,
render
?(
text
,
record
?),
[
key
:
string
]:
any
}[],
detailData
?:
any
}
/**
* 订单详情头部
*/
const
OrderDetailHeader
:
React
.
FC
<
OrderDetailHeaderProps
>
=
({
extraRight
,
detailList
=
[],
detailData
})
=>
{
const
isLoading
=
!!
detailData
return
(
<
div
className=
{
style
.
detailHeader
}
>
{
isLoading
?
<
Row
>
{
<
Col
>
<
Row
align=
'middle'
>
<
Col
>
<
ArrowLeftOutlined
onClick=
{
()
=>
history
.
goBack
()
}
/>
</
Col
>
<
Col
className=
{
style
.
titleAvator
}
>
单
</
Col
>
</
Row
>
</
Col
>
}
<
Col
style=
{
{
flex
:
1
}
}
>
<
Row
justify=
'space-between'
align=
'middle'
style=
{
{
paddingTop
:
14
}
}
>
<
Col
style=
{
{
flex
:
1
}
}
>
<
div
className=
{
style
.
titleAvatorText
}
>
订单号:
{
detailData
.
orderNo
}
</
div
>
<
Row
>
{
detailList
.
map
(
v
=>
{
const
{
label
,
render
,
name
,
...
colProps
}
=
v
return
(
detailData
[
name
]
||
detailData
[
name
]
===
0
)
?
<
Col
key=
{
label
}
{
...
colProps
}
className=
{
style
.
detailCol
}
>
<
span
className=
{
style
.
colLabel
}
>
{
label
}
:
</
span
>
{
render
?
render
(
detailData
[
name
],
detailData
)
:
<
span
>
{
detailData
[
name
]
}
</
span
>
}
</
Col
>
:
null
})
}
</
Row
>
</
Col
>
<
Col
>
{
extraRight
}
</
Col
>
</
Row
>
</
Col
>
</
Row
>
:
<
Skeleton
avatar=
{
{
shape
:
'square'
}
}
active
paragraph=
{
{
rows
:
3
}
}
/>
}
</
div
>
)
}
OrderDetailHeader
.
defaultProps
=
{}
export
default
OrderDetailHeader
src/pages/transaction/components/saleOrderProductTable/index.tsx
View file @
b72de57e
This diff is collapsed.
Click to expand it.
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