From c5dfc743f410b70f369ba3b708f05a6eb1563929 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Jun 2020 10:21:28 +0800
Subject: [PATCH] 20200629  代碼提交

---
 src/main/resources/templates/febs/views/modules/member/chargeUsdt.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
index 8457960..b3f10f8 100644
--- a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
+++ b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
@@ -163,20 +163,30 @@
                 elem: $view.find('table'),
                 id: 'userTable',
                 url: ctx + 'member/memberChargeUsdt',
+                totalRow: true,
                 cols: [[
-                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},
+                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
-                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center'},
-                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center'},
+                    {field: 'amountCny', title: '人民币金额', minWidth: 120,align:'center',totalRow: true},
+                    {field: 'amountUsdt', title: 'USDT金额', minWidth: 120,align:'center',totalRow: true},
                     {field: 'unitPrice', title: '单价', minWidth: 80,align:'center'},
-                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'},
                     {title: '付款状态', templet: '#order-Status', minWidth: 100,align:'center'},
-                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},
+                    {title: '操作', 
+                    	templet: function (d) {
+                            if (d.orderStatus === 2) {
+                            	return '<a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>'
+                            	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
+                            	+'<a lay-event="cancel" shiro:hasPermission="user:delete">系统撤单</a>'
+                            }else {
+                                return ''
+                            }
+                        },minWidth: 200,align:'center'},
                     {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},
                     {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},
                     {title: '收款方式', templet: '#payment-Type', minWidth: 100,align:'center'},
-                    {title: '操作', toolbar: '#user-option', minWidth: 150, fixed : 'right'}
+                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'center'},
+                    {field: 'createTime', title: '充值时间', minWidth: 180,align:'center'}
                 ]]
             });
         }

--
Gitblit v1.9.1