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
d80db73d
Commit
d80db73d
authored
Oct 20, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改新增采购订单的参数
parent
853db892
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
10 deletions
+5
-10
index.tsx
src/pages/lxMall/commodityDetail/index.tsx
+1
-0
index.tsx
src/pages/lxMall/order/index.tsx
+2
-6
index.tsx
src/pages/lxMall/purchaseOnline/index.tsx
+0
-4
index.tsx
src/pages/lxMall/purchaseOrder/index.tsx
+2
-0
No files found.
src/pages/lxMall/commodityDetail/index.tsx
View file @
d80db73d
...
...
@@ -455,6 +455,7 @@ const CommodityDetail = (props) => {
payWayList
:
priceType
===
COMMODITY_TYPE
.
integral
?
integralPayWay
:
payWayList
,
supplyMembersName
:
commodityDetail
.
memberName
,
supplyMembersId
:
commodityDetail
.
memberId
,
supplyMembersRoleId
:
commodityDetail
.
memberRoleId
,
orderList
:
[{
id
:
shopInfo
.
id
,
shopname
:
shopInfo
.
company
,
...
...
src/pages/lxMall/order/index.tsx
View file @
d80db73d
...
...
@@ -266,6 +266,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
for
(
let
item
of
orderList
)
{
for
(
let
orderItem
of
item
.
orderList
)
{
let
temp
:
any
=
{}
temp
.
imgUrl
=
orderItem
.
commodityPic
temp
.
productId
=
orderItem
.
id
temp
.
productName
=
orderItem
.
name
temp
.
unit
=
orderItem
.
unitName
...
...
@@ -279,6 +280,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
}
}
params
.
supplyMembersId
=
orderInfo
.
supplyMembersId
params
.
supplyMembersRoleId
=
orderInfo
.
supplyMembersRoleId
params
.
deliveryType
=
orderInfo
.
logistics
.
deliveryType
params
.
orderProductRequests
=
orderProductRequests
params
.
paymentInformationResponses
=
[{
...
...
@@ -295,12 +297,6 @@ const Order: React.FC<OrderPropsType> = (props) => {
if
(
res
.
code
===
1000
)
{
const
data
=
res
.
data
history
.
push
(
`/pay?orderId=
${
data
.
orderId
}
`
)
// if (res.data.isPay === 1) {
// const data = res.data
// history.push(`/pay?orderId=${data.orderId}`)
// } else {
// history.push(`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?modelType=5&spam_id=${spam_id}`)
// }
}
setConfirmLoading
(
false
)
}).
catch
(()
=>
{
...
...
src/pages/lxMall/purchaseOnline/index.tsx
View file @
d80db73d
...
...
@@ -115,16 +115,12 @@ const PurchaseOnline: React.FC<PurchaseOnlinePropsType> = (props) => {
}
}
return
(
<
div
className=
{
styles
.
purchaseOnline
}
>
<
div
className=
{
styles
.
mall_container
}
>
<
div
className=
{
styles
.
commodity_container
}
>
<
Filter
filterConfig=
{
filterConfig
}
{
...
props
}
/>
<
div
className=
{
styles
.
commodity_main
}
>
{
/* <div className="banner">
<img src={bannerImg} />
</div> */
}
<
div
className=
{
styles
.
tool_bar
}
>
<
div
className=
{
styles
.
tool_bar_left
}
>
<
div
className=
{
styles
.
tool_bar_filter_item
}
onClick=
{
()
=>
handleSort
(
FILTER_TYPE
.
dateSort
)
}
>
...
...
src/pages/lxMall/purchaseOrder/index.tsx
View file @
d80db73d
...
...
@@ -113,6 +113,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
let
temp
:
any
=
{}
temp
.
id
=
item
.
commodityUnitPrice
.
commodity
.
storeId
temp
.
memberId
=
item
.
commodityUnitPrice
.
commodity
.
memberId
temp
.
memberRoleId
=
item
.
commodityUnitPrice
.
commodity
.
memberRoleId
temp
.
shopname
=
item
.
commodityUnitPrice
.
commodity
.
memberName
let
tempPriceRange
=
[]
let
unitPrice
=
item
.
commodityUnitPrice
.
unitPrice
...
...
@@ -525,6 +526,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
logistics
:
commonLogistics
,
supplyMembersName
:
selectItem
.
shopname
,
supplyMembersId
:
selectItem
.
memberId
,
supplyMembersRoleId
:
selectItem
.
memberRoleId
,
orderList
:
[{
id
:
selectItem
.
id
,
shopname
:
selectItem
.
shopname
,
...
...
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