From 4ee42556139749bf6f29d47b912da0be6c37da2a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 11:29:39 +0800
Subject: [PATCH] feat(mall): 添加商品 SKU静态属性价格字段
---
src/main/resources/templates/febs/views/modules/order/refundList.html | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 cbfffef..c07452a 100644
--- a/src/main/resources/templates/febs/views/modules/order/refundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -86,7 +86,12 @@
var data = obj.data,
layEvent = obj.event;
if (layEvent === 'refunding') {
- febs.modal.open( '退款进度', 'modules/order/seeRefund/' + data.id, {
+ febs.modal.open( '退款进度', 'modules/order/refunding/' + data.id, {
+ maxmin: true,
+ });
+ }
+ if (layEvent === 'refundOrderDetail') {
+ febs.modal.open( '订单详情', 'modules/order/refundOrderDetail/' + data.id, {
maxmin: true,
});
}
@@ -114,6 +119,11 @@
if (layEvent === 'refundConfirm') {
febs.modal.confirm('退款确认', '确认已退款？', function () {
refundConfirm(data.id);
+ });
+ }
+ if (layEvent === 'paymentInfo') {
+ febs.modal.open( '收款信息', 'modules/order/refundPayInfo/' + data.id, {
+ maxmin: true,
});
}
});
@@ -160,7 +170,29 @@
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.beforeStatus === 1) {
+ return '<span style="color:red;">待支付</span>'
+ } else if (d.beforeStatus === 2) {
+ return '<span style="color:green;">待发货</span>'
+ }else if (d.beforeStatus === 3) {
+ return '<span style="color:green;">待收货</span>'
+ }else if (d.beforeStatus === 4) {
+ return '<span style="color:green;">已完成</span>'
+ }else if (d.beforeStatus === 5) {
+ return '<span style="color:green;">退款中</span>'
+ }else if (d.beforeStatus === 6) {
+ return '<span style="color:green;">已退款</span>'
+ }else if (d.beforeStatus === 7) {
+ return '<span style="color:green;">已取消</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 80,align:'center'},
+ {field: 'amount', title: '退款金额', minWidth: 150,align:'left'},
{field: 'type', title: '退款类型',
templet: function (d) {
if (d.type === 1) {
@@ -189,6 +221,7 @@
}
}, minWidth: 80,align:'center'},
{field: 'addressDetail', title: '收货信息', minWidth: 150,align:'left'},
+ {field: 'createdTime', title: '创建时间', minWidth: 150,align:'left'},
{title: '操作',
templet: function (d) {
if(d.status === 1){
@@ -196,20 +229,30 @@
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}else if(d.type === 2){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agreeWithAddress" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}
}else if(d.status === 4){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundConfirm" shiro:hasPermission="user:update">退款确认</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>'
}
},minWidth: 300,align:'center'}
--
Gitblit v1.9.1