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
97fc38f9
Commit
97fc38f9
authored
Dec 16, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理商品导出二维码错误提示,e账户充值快捷方式进入直接开启倒计时
parent
8b10b388
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
9 deletions
+10
-9
index.tsx
src/pages/commodity/products/index.tsx
+5
-4
index.tsx
src/pages/payandSettle/capitalAccounts/eAccount/index.tsx
+3
-1
index.tsx
...Settle/eAccountApprove/components/companyFinish/index.tsx
+1
-1
useOrderDetail.tsx
...ages/transaction/_public/order/effects/useOrderDetail.tsx
+0
-2
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+1
-0
index.tsx
...eOrder/orderCollectCash/components/addressModal/index.tsx
+0
-1
No files found.
src/pages/commodity/products/index.tsx
View file @
97fc38f9
...
...
@@ -534,10 +534,10 @@ const Products: React.FC<{}> = () => {
setExportLoading
(
true
)
postProductCommodityExportCommodityQrCode
({
idList
:
currentRef
.
current
},
{
responseType
:
'blob'
,
getResponse
:
true
}).
then
((
res
:
any
)
=>
{
const
{
code
,
data
,
response
}
=
res
const
filename
=
response
.
headers
.
get
(
'content-disposition'
).
split
(
'='
)[
1
]
if
(
code
)
{
throw
new
TypeError
(
res
.
message
)
if
(
code
!==
1000
)
{
throw
new
Error
(
res
.
message
)
}
else
{
const
filename
=
response
.
headers
.
get
(
'content-disposition'
).
split
(
'='
)[
1
]
let
blob
=
new
Blob
([
data
],
{
type
:
"application/x-zip-compressed"
})
// let objectUrl = URL.createObjectURL(blob)
// window.location.href = objectUrl
...
...
@@ -547,7 +547,8 @@ const Products: React.FC<{}> = () => {
a
.
click
();
window
.
URL
.
revokeObjectURL
(
url
);
}
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
console
.
log
(
error
,
'error'
)
message
.
error
(
error
)
}).
finally
(()
=>
{
setExportLoading
(
false
)
...
...
src/pages/payandSettle/capitalAccounts/eAccount/index.tsx
View file @
97fc38f9
...
...
@@ -268,6 +268,7 @@ const EAccountDetail: React.FC<{}> = () => {
modalRef
.
current
.
setVisible
(
false
)
setSendCodeVisible
(
true
)
setTradeCode
(
data
.
tradeCode
)
start
()
}
else
if
(
code
===
1000
&&
parasm
.
type
===
'GATEWAY_VSP'
)
{
modalRef
.
current
.
setVisible
(
false
)
setPayResultVisible
(
true
)
...
...
@@ -283,6 +284,7 @@ const EAccountDetail: React.FC<{}> = () => {
const
handleRecharge
=
()
=>
{
modalRef
.
current
.
setVisible
(
true
)
}
const
applyWithdraw
=
()
=>
{
...
...
@@ -291,11 +293,11 @@ const EAccountDetail: React.FC<{}> = () => {
}
const
handleWithdraw
=
()
=>
{
setLoading
(
true
)
withdrawForm
.
submit
()
}
const
handleWidthdrawSubmit
=
(
values
)
=>
{
setLoading
(
true
)
const
amount
=
Number
(
values
.
amount
)
if
(
amount
>
0
&&
amount
<=
details
.
usableBalance
)
{
// 大于0并且小于可用金额
let
params
=
{
...
...
src/pages/payandSettle/eAccountApprove/components/companyFinish/index.tsx
View file @
97fc38f9
...
...
@@ -103,7 +103,7 @@ const CompanyFinish: React.FC<{}> = () => {
</
Col
>
<
Col
span=
{
12
}
>
<
Row
className=
{
styles
[
'card-list'
]
}
>
<
Col
span=
{
6
}
className=
{
styles
[
'card-list_title'
]
}
>
{
intl
.
formatMessage
({
id
:
'payandSettle.capitalAccounts.eAccount.zhihanghanghao'
,
defaultMessage
:
'支
行
行号'
})
}
</
Col
>
<
Col
span=
{
6
}
className=
{
styles
[
'card-list_title'
]
}
>
{
intl
.
formatMessage
({
id
:
'payandSettle.capitalAccounts.eAccount.zhihanghanghao'
,
defaultMessage
:
'支
付
行号'
})
}
</
Col
>
<
Col
>
{
data
.
bankNo
}
</
Col
>
</
Row
>
</
Col
>
...
...
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @
97fc38f9
...
...
@@ -104,8 +104,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const
payObj
=
data
.
payments
.
filter
(
item
=>
item
.
showPayment
)[
0
]
setCurrentPayInfoId
(
payObj
?.
paymentId
?
payObj
.
paymentId
:
data
.
payments
[
0
].
paymentId
)
}
}
else
{
message
.
error
(
msg
)
}
})
}
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
97fc38f9
...
...
@@ -384,6 +384,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setPayStep
(
3
)
setTradeCode
(
res
.
data
.
tradeNo
)
setCurrent
(
1000
)
start
()
}
else
if
(
tonglian
&&
checked
.
id
===
14
)
{
console
.
log
(
current
,
checked
,
'通联快捷跳转'
)
setCurrent
(
1000
)
...
...
src/pages/transaction/purchaseOrder/orderCollectCash/components/addressModal/index.tsx
View file @
97fc38f9
...
...
@@ -131,7 +131,6 @@ const AddressModal:React.FC<AddressModalProps> = (props) => {
effects=
{
(
$
,
ctx
)
=>
{
$
(
'onFormMount'
).
subscribe
(()
=>
{
// 四级联动
console
.
log
(
$
,
ctx
,
1
)
useChainEffects
(
$
,
ctx
)
})
...
...
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