Commit 701d91c6 authored by GuanHua's avatar GuanHua

fix:下单时是否显示发票判断

parent 490ca5ad
...@@ -348,7 +348,7 @@ const CommodityDetail = (props) => { ...@@ -348,7 +348,7 @@ const CommodityDetail = (props) => {
postFn = PublicApi.postSearchShopPurchaseSaveOrUpdatePurchase postFn = PublicApi.postSearchShopPurchaseSaveOrUpdatePurchase
break; break;
} }
PublicApi.postOrderDirectPayment({ productId: selectCommodityId }).then(res => { PublicApi.postOrderDirectPayment({ productId: selectCommodityId, memberId }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
message.destroy() message.destroy()
postFn && postFn(param).then(res => { postFn && postFn(param).then(res => {
...@@ -362,6 +362,8 @@ const CommodityDetail = (props) => { ...@@ -362,6 +362,8 @@ const CommodityDetail = (props) => {
clickFlag = true clickFlag = true
}) })
} }
}).catch(() => {
clickFlag = true
}) })
} }
} }
...@@ -468,7 +470,7 @@ const CommodityDetail = (props) => { ...@@ -468,7 +470,7 @@ const CommodityDetail = (props) => {
category: commodityDetail.customerCategory.name, category: commodityDetail.customerCategory.name,
brand: commodityDetail.brand.name, brand: commodityDetail.brand.name,
stockCount: stockCount, stockCount: stockCount,
commodityPic: attrAndValList.commodityPic ? attrAndValList.commodityPic[0] : '', commodityPic: attrAndValList.commodityPic ? attrAndValList.commodityPic[0] : commodityDetail.mainPic,
attribute: attrAndValList.attributeAndValueList attribute: attrAndValList.attributeAndValueList
} }
...@@ -480,6 +482,7 @@ const CommodityDetail = (props) => { ...@@ -480,6 +482,7 @@ const CommodityDetail = (props) => {
supplyMembersName: commodityDetail.memberName, supplyMembersName: commodityDetail.memberName,
supplyMembersId: commodityDetail.memberId, supplyMembersId: commodityDetail.memberId,
supplyMembersRoleId: commodityDetail.memberRoleId, supplyMembersRoleId: commodityDetail.memberRoleId,
isInvoice: commodityDetail.isInvoice,
orderList: [{ orderList: [{
id: shopInfo.id, id: shopInfo.id,
shopname: shopInfo.company, shopname: shopInfo.company,
...@@ -497,6 +500,8 @@ const CommodityDetail = (props) => { ...@@ -497,6 +500,8 @@ const CommodityDetail = (props) => {
} else { } else {
clickFlag = true clickFlag = true
} }
}).catch(() => {
clickFlag = true
}) })
} }
......
...@@ -423,7 +423,9 @@ const Order: React.FC<OrderPropsType> = (props) => { ...@@ -423,7 +423,9 @@ const Order: React.FC<OrderPropsType> = (props) => {
} }
<PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId} selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} /> <PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId} selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
{/* <Delivery /> */} {/* <Delivery /> */}
<Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} /> {
orderInfo.isInvoice && <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />
}
{ {
isElectronicContract && <Contract contractInfo={contractInfo} state={needTheContract} onChange={(val) => setneedTheContract(val)} /> isElectronicContract && <Contract contractInfo={contractInfo} state={needTheContract} onChange={(val) => setneedTheContract(val)} />
} }
......
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