From 05bfbb32f1eea70f54092ae8366b91d9f1bcf8b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 18:51:08 +0800
Subject: [PATCH] 20210924

---
 src/main/resources/templates/febs/views/modules/order/refundList.html |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 16 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 69b1d7e..cbfffef 100644
--- a/src/main/resources/templates/febs/views/modules/order/refundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -95,6 +95,17 @@
                     agreeRefund(data.id);
                 });
             }
+            if (layEvent === 'agreeWithAddress') {
+                febs.modal.open('选择退货地址', 'modules/order/withAddress/' + data.id, {
+                    btn: ['确认', '取消'],
+                    yes: function (index, layero) {
+                        $('#address-choose').find('#submit').trigger('click');
+                    },
+                    btn2: function () {
+                        layer.closeAll();
+                    }
+                });
+            }
             if (layEvent === 'disagree') {
                 febs.modal.confirm('拒绝', '拒绝此次退款申请?', function () {
                     disagreeRefund(data.id);
@@ -147,9 +158,19 @@
                 id: 'orderRefundTable',
                 url: ctx + 'admin/order/refundList',
                 cols: [[
-                    {field: 'name', title: '用户名', minWidth: 150,align:'left'},
-                    {field: 'phone', title: '电话', minWidth: 150,align:'left'},
                     {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+                    {field: 'buyName', title: '用户名', minWidth: 150,align:'left'},
+                    {field: 'buyPhone', title: '电话', minWidth: 150,align:'left'},
+                    {field: 'type', title: '退款类型',
+                        templet: function (d) {
+                            if (d.type === 1) {
+                                return '<span">仅退款不退货</span>'
+                            } else if (d.type === 2) {
+                                return '<span>退款退货</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 80,align:'center'},
                     {field: 'reason', title: '退款原因', minWidth: 150,align:'left'},
                     {field: 'status', title: '状态',
                         templet: function (d) {
@@ -167,23 +188,23 @@
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
-                    //     {field: 'accountStatus', title: '账号状态',
-                    //         templet: function (d) {
-                    //             if (d.accountStatus === 1) {
-                    //                 return '<span style="color:green;">正常</span>'
-                    //             } else if (d.accountStatus === 2) {
-                    //                 return '<span style="color:red;">禁用</span>'
-                    //             }else{
-                    //                 return ''
-                    //             }
-                    //         }, minWidth: 80,align:'center'},
-                    //     {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
+                    {field: 'addressDetail', title: '收货信息', minWidth: 150,align:'left'},
                     {title: '操作',
                         templet: function (d) {
                         if(d.status === 1){
-                            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>'
+                            if(d.type === 1){
+                                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.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>'
+                            }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>'
+                            }
                         }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>'

--
Gitblit v1.9.1