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
d6f215a5
Commit
d6f215a5
authored
Aug 26, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 添加 在线支付的商户订单号字段
parent
f76d7b37
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
33 deletions
+3
-33
index.tsx
src/components/AddressSelect/index.tsx
+1
-2
index.tsx
src/pages/afterService/components/GoodsDrawer/index.tsx
+0
-26
index.tsx
src/pages/afterService/components/ReturnInfoDrawer/index.tsx
+2
-4
index.tsx
...pplication/returnPrSubmit/components/ReturnForm/index.tsx
+0
-1
No files found.
src/components/AddressSelect/index.tsx
View file @
d6f215a5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-08-05 10:28:06
* @Date: 2021-08-05 10:28:06
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-26
09:47:51
* @LastEditTime: 2021-08-26
18:16:30
* @Description: 地址选择 FormItem
* @Description: 地址选择 FormItem
*/
*/
import
React
,
{
useState
,
useEffect
,
useMemo
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useMemo
,
useRef
}
from
'react'
;
...
@@ -465,7 +465,6 @@ const AddressSelect: React.FC<IProps> = (props) => {
...
@@ -465,7 +465,6 @@ const AddressSelect: React.FC<IProps> = (props) => {
},
[
list
]);
},
[
list
]);
if
(
!
editable
&&
value
)
{
if
(
!
editable
&&
value
)
{
console
.
log
(
'list'
,
list
)
const
current
=
list
.
find
((
item
)
=>
item
.
id
===
value
);
const
current
=
list
.
find
((
item
)
=>
item
.
id
===
value
);
const
full
=
current
?
`
${
current
.
name
}
${
current
.
fullAddress
}
${
current
.
phone
}
`
:
null
;
const
full
=
current
?
`
${
current
.
name
}
${
current
.
fullAddress
}
${
current
.
phone
}
`
:
null
;
const
isStr
=
typeof
value
===
'string'
;
const
isStr
=
typeof
value
===
'string'
;
...
...
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @
d6f215a5
...
@@ -390,32 +390,6 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
...
@@ -390,32 +390,6 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
fullDate
.
push
({
fullDate
.
push
({
...
product
,
...
product
,
orderNo
:
product
.
orderNo
,
// 手动补全订单单号
orderNo
:
product
.
orderNo
,
// 手动补全订单单号
payList
:
product
.
payInfoList
?
product
.
payInfoList
.
map
(
item
=>
{
const
{
payPrice
,
payTime
,
payWay
,
channel
,
payCode
,
ruleConfigurationId
,
...
rest
}
=
item
;
return
{
payAmount
:
payPrice
,
payTime
:
payTime
?
moment
(
payTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
null
,
payWay
,
channel
,
payWayName
:
PAYWAY
[
payWay
],
channelName
:
PAY_CHANNEL
[
channel
],
transactionPayId
:
payCode
,
payRuleId
:
ruleConfigurationId
,
...
rest
,
}
})
:
[]
,
});
});
}
}
});
});
...
...
src/pages/afterService/components/ReturnInfoDrawer/index.tsx
View file @
d6f215a5
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2020-11-05 17:36:45
* @Date: 2020-11-05 17:36:45
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-26 1
5:34:25
* @LastEditTime: 2021-08-26 1
9:54:01
* @Description: 查看退货数量与退款金额 抽屉
* @Description: 查看退货数量与退款金额 抽屉
*/
*/
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
React
,
{
useEffect
,
useState
}
from
'react'
;
...
@@ -20,8 +20,6 @@ import schema from './schema';
...
@@ -20,8 +20,6 @@ import schema from './schema';
import
{
createEffects
}
from
'./effects'
;
import
{
createEffects
}
from
'./effects'
;
import
Stamp
from
'../Stamp'
;
import
Stamp
from
'../Stamp'
;
import
SteamerTicket
from
'./components/SteamerTicket'
;
import
SteamerTicket
from
'./components/SteamerTicket'
;
import
styles
from
'./index.less'
;
import
moment
from
'moment'
;
const
schemaAction
=
createAsyncFormActions
();
const
schemaAction
=
createAsyncFormActions
();
const
{
const
{
...
@@ -222,7 +220,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
...
@@ -222,7 +220,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
payTime
:
item
.
payTime
,
payTime
:
item
.
payTime
,
payRuleId
:
item
.
fundMode
,
payRuleId
:
item
.
fundMode
,
externalState
:
3
,
externalState
:
3
,
transactionPayId
:
'123'
,
// 微信 或 其他第三方支付返回的 code,原路退款需要
transactionPayId
:
item
.
tradeNo
,
// 微信 或 其他第三方支付返回的 code,原路退款需要
}));
}));
}
}
}
}
...
...
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @
d6f215a5
...
@@ -690,7 +690,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
...
@@ -690,7 +690,6 @@ const ReturnForm: React.FC<BillsFormProps> = ({
extraData
:
{
extraData
:
{
id
:
item
.
id
,
id
:
item
.
id
,
returnReason
:
''
,
returnReason
:
''
,
payList
:
item
.
payList
,
taskTypeKey
:
item
.
processKey
,
taskTypeKey
:
item
.
processKey
,
remaining
:
item
.
quantity
-
(
item
.
returnCount
||
0
),
// 可退货数量
remaining
:
item
.
quantity
-
(
item
.
returnCount
||
0
),
// 可退货数量
orderId
:
item
.
orderId
,
orderId
:
item
.
orderId
,
...
...
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