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
linweijiong
jinfa-platform
Commits
434c7962
Commit
434c7962
authored
Dec 31, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
c91d949b
b148e410
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
index.tsx
src/pages/afterService/components/GoodsDrawer/index.tsx
+12
-2
index.tsx
...cation/exchangePrSubmit/components/ExchangeForm/index.tsx
+1
-0
No files found.
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @
434c7962
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-
29 11:32:18
* @LastEditTime: 2020-12-
31 14:29:36
* @Description: 维修商品抽屉组件
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
...
@@ -472,7 +472,15 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
payList
:
product
.
payInfoList
?
product
.
payInfoList
.
map
(
item
=>
{
const
{
payPrice
,
payTime
,
payWay
,
channel
,
...
rest
}
=
item
;
const
{
payPrice
,
payTime
,
payWay
,
channel
,
payCode
,
ruleConfigurationId
,
...
rest
}
=
item
;
return
{
payAmount
:
payPrice
,
payTime
:
moment
(
payTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
...
...
@@ -480,6 +488,8 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
channel
,
payWayName
:
PAYWAY
[
payWay
],
channelName
:
PAY_CHANNEL
[
channel
],
transactionPayId
:
payCode
,
payRuleId
:
ruleConfigurationId
,
...
rest
,
}
})
:
...
...
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @
434c7962
...
...
@@ -86,6 +86,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
title
:
'下单时间'
,
dataIndex
:
'createTime'
,
align
:
'center'
,
render
:
text
=>
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
},
{
title
:
'订单状态'
,
...
...
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