xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商城测试版v8

Browse Source
This commit is contained in:
cheng
2022-07-26 18:36:47 +08:00
parent 341c5c2eed
commit 3009b65e00
17 changed files with 106 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/orderBtns/index.tsx
+4 -4
View File
@@ -85,7 +85,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusAlreadyReceipt.value,
SaleOrderStatusComplete.value
]
return orderInfo.wait_pay_amount != 0 && orderStatus.includes(orderInfo.status)
return orderInfo.wait_pay_amount > 0 && orderStatus.includes(orderInfo.status)
}
},
{
@@ -98,7 +98,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusWaitingDelivery.value,
SaleOrderStatusTaking.value
]
return orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount != 0 && orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
return orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
}
},
{
@@ -110,7 +110,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusAlreadyReceipt.value,
SaleOrderStatusRefund.value
]
return orderInfo.av_return_roll&& orderStatus.includes(orderInfo.status)
return orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
}
},
{
@@ -141,7 +141,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
let orderStatus = [
SaleOrderStatusBooking.value
]
return orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount != 0 && orderStatus.includes(orderInfo.status)
return orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderStatus.includes(orderInfo.status)
}
},
{