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
57396c64
Commit
57396c64
authored
Dec 29, 2020
by
XieZhiXiong
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
139dfbc3
16fde2c0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
index.tsx
src/pages/commodity/products/index.tsx
+1
-1
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+3
-4
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+1
-1
No files found.
src/pages/commodity/products/index.tsx
View file @
57396c64
...
...
@@ -390,7 +390,7 @@ const Products: React.FC<{}> = () => {
const
onChangeUpShop
=
(
values
)
=>
{
// 判断上架之前是否有店铺 有即可以上下架
if
(
judgeShopRef
.
current
){
PublicApi
.
getTemplate
ShopFind
Shop
({
PublicApi
.
getTemplate
WebMemberShopWebFindCurrMember
Shop
({
memberId
:
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'auth'
)).
memberId
,
memberRoleId
:
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'auth'
)).
memberRoleId
}).
then
(
res
=>
{
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
57396c64
...
...
@@ -161,9 +161,10 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
history
.
goBack
()
},
1000
)
}
}
else
{
message
.
error
(
res
.
message
)
}
// else {
// message.error(res.message)
// }
})
}
}
...
...
@@ -189,8 +190,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setCreditInfo
(
res
.
data
)
}
else
{
message
.
error
(
res
.
message
)
}
setIsSpin
(
false
)
})
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
57396c64
...
...
@@ -223,7 +223,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
throw
new
Error
(
'请选择支付方式或支付渠道'
)
}
let
judgementByRatio
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
if
(
Number
(
item
.
payRatio
)
>
0
&&
Number
(
item
.
payRatio
)
<
100
){
if
(
Number
(
item
.
payRatio
)
>
0
&&
Number
(
item
.
payRatio
)
<
=
100
){
return
true
}
else
{
return
false
...
...
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