Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-25 2e10dd5a3cb31a6bcce1da08c69bb927f22d3bac

 src/main/resources/templates/febs/views/modules/order/refundList.html

@@ -86,7 +86,7 @@
            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,
                });
            }
@@ -189,6 +189,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){