mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
synced 2026-11-13 04:18:55 +08:00
fix(order): 修复已取消订单退款标签及支付状态显示问题
- 新增 canShowRefundTag 函数,未支付订单不再展示退款标签 - 已取消(CANCELLED)订单的支付方式字段返回空字符串 - 修改 isUnpaid 函数,排除已取消订单被误判为未支付状态
This commit is contained in:
@@ -73,7 +73,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="goods-num">共{{ goods.num }}件</div>
|
<div class="goods-num">共{{ goods.num }}件</div>
|
||||||
<div class="goods-extra">
|
<div class="goods-extra">
|
||||||
<el-tag v-if="refundPriceList(goods.isRefund) && !isUnpaid(order)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
|
<el-tag v-if="canShowRefundTag(order, goods)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -160,7 +160,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="goods-num">共{{ goods.num }}件</div>
|
<div class="goods-num">共{{ goods.num }}件</div>
|
||||||
<div class="goods-extra">
|
<div class="goods-extra">
|
||||||
<el-tag v-if="refundPriceList(goods.isRefund) && !isUnpaid(order)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
|
<el-tag v-if="canShowRefundTag(order, goods)" type="warning" size="small">{{ refundPriceList(goods.isRefund) }}</el-tag>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -264,6 +264,11 @@ function refundPriceList(status) {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
function canShowRefundTag (order, goods) {
|
||||||
|
// 未支付订单未发生资金交易,不展示退款标签
|
||||||
|
if (!order || order.payStatus !== 'PAID') return false;
|
||||||
|
return !!refundPriceList(goods?.isRefund);
|
||||||
|
}
|
||||||
function goodsDetail (skuId, goodsId) {
|
function goodsDetail (skuId, goodsId) {
|
||||||
// 跳转商品详情
|
// 跳转商品详情
|
||||||
let routeUrl = router.resolve({
|
let routeUrl = router.resolve({
|
||||||
@@ -445,13 +450,16 @@ function paymentLabel (order) {
|
|||||||
if (order.paymentMethod && map[order.paymentMethod]) {
|
if (order.paymentMethod && map[order.paymentMethod]) {
|
||||||
return map[order.paymentMethod]
|
return map[order.paymentMethod]
|
||||||
}
|
}
|
||||||
|
if (order.orderStatus === 'CANCELLED') {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
if (isUnpaid(order)) {
|
if (isUnpaid(order)) {
|
||||||
return '待支付'
|
return '待支付'
|
||||||
}
|
}
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
function isUnpaid (order) {
|
function isUnpaid (order) {
|
||||||
return order.payStatus === 'UNPAID' || order.orderStatus === 'UNPAID'
|
return (order.payStatus === 'UNPAID' || order.orderStatus === 'UNPAID') && order.orderStatus !== 'CANCELLED'
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(() => route.query.tag, () => {
|
watch(() => route.query.tag, () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user