Commit d80db73d authored by GuanHua's avatar GuanHua

feat:修改新增采购订单的参数

parent 853db892
......@@ -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,
......
......@@ -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(() => {
......
......@@ -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)}>
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment