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
黄庭坚
jinfa-platform
Commits
0bfec93f
Commit
0bfec93f
authored
Jan 29, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理商城下单商品名称没有属性字符的问题
parent
eb6fcc97
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
router.config.json
config/router.config.json
+0
-0
index.tsx
src/pages/transaction/components/orderPayTabs/index.tsx
+8
-1
index.ts
...s/transaction/purchaseOrder/orderCollect/effects/index.ts
+1
-1
No files found.
config/router.config.json
0 → 100644
View file @
0bfec93f
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/pages/transaction/components/orderPayTabs/index.tsx
View file @
0bfec93f
import
React
,
{
useContext
,
useEffect
,
useState
}
from
'react'
import
React
,
{
useContext
,
useEffect
,
useState
}
from
'react'
import
style
from
'./index.less'
import
style
from
'./index.less'
import
{
Tabs
,
Row
,
Col
,
Modal
,
List
}
from
'antd'
import
{
Tabs
,
Row
,
Col
,
Modal
,
List
,
Tooltip
}
from
'antd'
import
{
OrderDetailContext
}
from
'../../_public/order/context'
import
{
OrderDetailContext
}
from
'../../_public/order/context'
import
MellowCard
from
'@/components/MellowCard'
import
MellowCard
from
'@/components/MellowCard'
import
StatusColors
from
'../StatusColors'
import
StatusColors
from
'../StatusColors'
...
@@ -8,6 +8,7 @@ import moment from 'moment'
...
@@ -8,6 +8,7 @@ import moment from 'moment'
import
{
PayOutWorkState
}
from
'@/constants'
import
{
PayOutWorkState
}
from
'@/constants'
import
OverflowText
from
'@/components/OverflowText'
import
OverflowText
from
'@/components/OverflowText'
import
{
isTemplateExpression
}
from
'typescript'
import
{
isTemplateExpression
}
from
'typescript'
import
{
QuestionCircleOutlined
}
from
'@ant-design/icons'
/**
/**
* 展示 支付比例和简单流程的发货信息
* 展示 支付比例和简单流程的发货信息
...
@@ -56,6 +57,12 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
...
@@ -56,6 +57,12 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
<
div
className=
{
style
.
smallnumber
}
>
<
div
className=
{
style
.
smallnumber
}
>
{
dataSource
.
channel
!==
0
&&
'¥'
}
{
dataSource
.
channel
!==
0
&&
'¥'
}
{
dataSource
.
payPrice
||
0
}
{
dataSource
.
payPrice
||
0
}
{
dataSource
.
refundPrice
&&
<
Tooltip
title=
{
`本次实际支付金额(¥${data.payPrice-data.refundPrice})=本次订单待支付金额(¥${data.payPrice})-售后待退款金额(¥${data.refundPrice})`
}
>
<
QuestionCircleOutlined
/>
</
Tooltip
>
}
</
div
>
</
div
>
</
Col
>
</
Col
>
<
Col
>
<
Col
>
...
...
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @
0bfec93f
...
@@ -178,7 +178,6 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
...
@@ -178,7 +178,6 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
ctx
.
setFieldValue
(
'supplyMembersName'
,
initValue
.
supplyMembersName
)
ctx
.
setFieldValue
(
'supplyMembersName'
,
initValue
.
supplyMembersName
)
initValue
.
idList
&&
ctx
.
setFieldValue
(
'idList'
,
initValue
.
idList
)
initValue
.
idList
&&
ctx
.
setFieldValue
(
'idList'
,
initValue
.
idList
)
initValue
.
productType
&&
ctx
.
setFieldValue
(
'productType'
,
initValue
.
productType
)
initValue
.
productType
&&
ctx
.
setFieldValue
(
'productType'
,
initValue
.
productType
)
ctx
.
setFieldValue
(
'orderProductRequests'
,
await
filterProductDataById
([],
productInfo
.
map
(
v
=>
{
ctx
.
setFieldValue
(
'orderProductRequests'
,
await
filterProductDataById
([],
productInfo
.
map
(
v
=>
{
return
{
return
{
...
v
,
...
v
,
...
@@ -194,6 +193,7 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
...
@@ -194,6 +193,7 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
memberRoleId
:
initValue
.
supplyMembersRoleId
,
memberRoleId
:
initValue
.
supplyMembersRoleId
,
commodityId
:
v
.
id
,
// 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他)
commodityId
:
v
.
id
,
// 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他)
memberPrice
:
v
.
memberDiscount
!==
1
?
v
.
memberDiscount
:
1
,
// 添加会员折扣
memberPrice
:
v
.
memberDiscount
!==
1
?
v
.
memberDiscount
:
1
,
// 添加会员折扣
name
:
v
.
attribute
?.
length
?
v
.
name
+
'/'
+
v
.
attribute
.
map
(
item
=>
item
.
customerAttributeValue
.
value
).
join
(
'/'
)
:
v
.
name
,
}
}
})
})
))
))
...
...
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