From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 19 Dec 2024 17:50:05 +0800 Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑,使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义,确保数据展示正确 - 更新 buyVipList.html 中状态颜色,以更直观地显示不同状态 --- src/main/resources/templates/febs/views/modules/order/refundList.html | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/resources/templates/febs/views/modules/order/refundList.html b/src/main/resources/templates/febs/views/modules/order/refundList.html index 9015dbf..c07452a 100644 --- a/src/main/resources/templates/febs/views/modules/order/refundList.html +++ b/src/main/resources/templates/febs/views/modules/order/refundList.html @@ -170,22 +170,23 @@ cols: [[ {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'}, {field: 'buyName', title: '用户名', minWidth: 150,align:'left'}, - {field: 'buyPhone', title: '电话', minWidth: 150,align:'left'}, + {field: 'buyPhone', title: '账号', minWidth: 150,align:'left'}, + {field: 'buyBindPhone', title: '手机号', minWidth: 150,align:'left'}, {field: 'beforeStatus', title: '发货状态', templet: function (d) { - if (d.status === 1) { + if (d.beforeStatus === 1) { return '<span style="color:red;">待支付</span>' - } else if (d.status === 2) { + } else if (d.beforeStatus === 2) { return '<span style="color:green;">待发货</span>' - }else if (d.status === 3) { + }else if (d.beforeStatus === 3) { return '<span style="color:green;">待收货</span>' - }else if (d.status === 4) { + }else if (d.beforeStatus === 4) { return '<span style="color:green;">已完成</span>' - }else if (d.status === 5) { + }else if (d.beforeStatus === 5) { return '<span style="color:green;">退款中</span>' - }else if (d.status === 6) { + }else if (d.beforeStatus === 6) { return '<span style="color:green;">已退款</span>' - }else if (d.status === 7) { + }else if (d.beforeStatus === 7) { return '<span style="color:green;">已取消</span>' }else{ return '' -- Gitblit v1.9.1