From d7140004b514b43f9734d050fb65d0c2898cca7f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Nov 2022 10:25:42 +0800
Subject: [PATCH] 20221117

---
 src/main/resources/templates/febs/views/dapp/money-change-flow.html |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index 6721b5e..9e94d63 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -27,6 +27,7 @@
                                                 <option value="7">流水佣金</option>
                                                 <option value="8">盈利分成</option>
                                                 <option value="9">系统</option>
+                                                <option value="10">充值</option>
                                             </select>
                                         </div>
                                     </div>
@@ -138,18 +139,19 @@
                 elem: $view.find('table'),
                 id: 'moneyChangeTable',
                 url: ctx + 'flow/accountMoneyChangeFlow',
+                totalRow: true,
                 cols: [[
                     // {field: 'address', title: '地址', minWidth: 150},
-                    {field: 'username', title: '用户名', minWidth: 150},
+                    {field: 'username', title: '用户名', minWidth: 150, totalRowText: '合计'},
                     {field: 'preAmount', title: '变化前金额', minWidth: 100},
-                    {field: 'amount', title: '变化金额', minWidth: 100},
+                    {field: 'amount', title: '变化金额', minWidth: 100, totalRow: true},
                     {field: 'afterAmount', title: '变化后金额', minWidth: 100},
                     {field: 'content', title: '描述', minWidth: 130},
                     // {title: '类型', templet: '#type-format'},
                     {field: 'createTime', title: '创建时间', minWidth: 180},
                     {title: '流水记录',
                         templet: function (d) {
-                            if(d.orderId != null || d.orderId != ""){
+                            if(d.orderId > 0){
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="amountFlow" shiro:hasPermission="user:update">流水记录</button>'
                             }else{
                                 return ''

--
Gitblit v1.9.1