Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
1a4cd9d1
Commit
1a4cd9d1
authored
Nov 19, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:订单确认获取支付方式添加memberId字段,订单详情对收货无数据做隐藏处理
parent
35b39a64
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
global.d.ts
src/global/config/global.d.ts
+1
-1
index.tsx
...System/orderDetail/components/orderDeleveRecord/index.tsx
+11
-2
index.tsx
...orderSystem/orderDetail/components/orderPayTabs/index.tsx
+1
-1
No files found.
src/global/config/global.d.ts
View file @
1a4cd9d1
...
...
@@ -50,7 +50,7 @@ export interface ShopInfo {
type
:
number
;
environment
:
number
;
logoUrl
:
string
;
describe
?:
any
;
describe
:
string
;
state
:
number
;
url
:
string
;
}
...
...
src/pages/orderSystem/orderDetail/components/orderDeleveRecord/index.tsx
View file @
1a4cd9d1
...
...
@@ -241,9 +241,13 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
}
return
(
<>
{
(
orderReceivingStatisticsResponses
?.
length
>
0
||
orderDeliveryDetailsResponses
?.
length
>
0
)
&&
<
MellowCard
style=
{
{
marginTop
:
24
}
}
bordered=
{
false
}
id=
'deleveBox'
>
<
Tabs
defaultActiveKey=
"2"
animated=
{
false
}
>
<
Tabs
.
TabPane
tab=
'订单收货统计'
key=
"1"
>
{
orderReceivingStatisticsResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'订单收货统计'
key=
"1"
>
<
Table
columns=
{
outOrderCols
}
dataSource=
{
orderReceivingStatisticsResponses
}
...
...
@@ -251,7 +255,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
rowKey=
"productId"
/>
</
Tabs
.
TabPane
>
<
Tabs
.
TabPane
tab=
'订单收货明细'
key=
"2"
>
}
{
orderDeliveryDetailsResponses
?.
length
>
0
&&
<
Tabs
.
TabPane
tab=
'订单收货明细'
key=
"2"
>
<
NestTable
NestColumns=
{
[
sideOrderCols
,
sideChildrenCols
]
}
rowKey=
'id'
...
...
@@ -259,8 +265,11 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
dataSource=
{
orderDeliveryDetailsResponses
}
/>
</
Tabs
.
TabPane
>
}
</
Tabs
>
</
MellowCard
>
}
</>
)
}
...
...
src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx
View file @
1a4cd9d1
...
...
@@ -49,7 +49,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
const
[
payList
,
setPaylist
]
=
useState
<
any
[]
>
([])
useEffect
(()
=>
{
PublicApi
.
getPayPayWayList
().
then
(
res
=>
{
PublicApi
.
getPayPayWayList
(
{
memberId
:
data
.
supplyMembersId
}
).
then
(
res
=>
{
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
setPaylist
(
data
)
...
...
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