From fc8453995e0332ff313dacc27d081568caa0975f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 24 Sep 2021 15:32:58 +0800 Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall --- src/main/resources/templates/febs/views/modules/order/refundList.html | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 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 6670c4c..69b1d7e 100644 --- a/src/main/resources/templates/febs/views/modules/order/refundList.html +++ b/src/main/resources/templates/febs/views/modules/order/refundList.html @@ -100,6 +100,11 @@ disagreeRefund(data.id); }); } + if (layEvent === 'refundConfirm') { + febs.modal.confirm('退款确认', '确认已退款?', function () { + refundConfirm(data.id); + }); + } }); function agreeRefund(id) { @@ -111,6 +116,13 @@ function disagreeRefund(id) { febs.get(ctx + 'admin/order/disagreeRefund/' + id, null, function () { + febs.alert.success('操作成功'); + $query.click(); + }); + } + + function refundConfirm(id) { + febs.get(ctx + 'admin/order/refundConfirm/' + id, null, function () { febs.alert.success('操作成功'); $query.click(); }); @@ -172,6 +184,9 @@ 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>' + }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>' }else{ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' } -- Gitblit v1.9.1