From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付

---
 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index ff44032..8356371 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -8,23 +8,35 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">名称:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label">账号:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">状态</label>
+                                        <label class="layui-form-label">状态:</label>
                                         <div class="layui-input-inline">
                                             <select name="status">
                                                 <option value="">请选择</option>
                                                 <option value="1">提现中</option>
                                                 <option value="2">成功</option>
                                                 <option value="3">拒绝</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">类型:</label>
+                                        <div class="layui-input-inline">
+                                            <select name="type">
+                                                <option value="">请选择</option>
+                                                <option value="1">余额提现</option>
+                                                <option value="2">积分兑换</option>
                                             </select>
                                         </div>
                                     </div>
@@ -118,10 +130,26 @@
                 elem: $view.find('table'),
                 id: 'moneyFlowChargeTable',
                 url: ctx + 'admin/mallMember/getMoneyChargeList',
+                totalRow: true ,// 开启合计行
                 cols: [[
+                    {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
-                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
-                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+                    {field: 'type', title: '类型',
+                        templet: function (d) {
+                            if (d.type === 1) {
+                                return '<span style="color:green;">余额提现</span>'
+                            } else if (d.type === 2) {
+                                return '<span style="color:blue;">积分兑换</span>'
+                            } else{
+                                return ''
+                            }
+                        }, minWidth: 80,align:'center'},
+                    {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
+                    {field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
+                    {field: 'amountReal', title: '实际到账', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountReal) }}'},
+                    {field: 'scoreCnt', title: '数量', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.scoreCnt) }}'},
+                    {field: 'scorePrice', title: '价格', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.scorePrice) }}'},
                     {field: 'status', title: '状态',
                         templet: function (d) {
                             if (d.status === 1) {
@@ -142,7 +170,7 @@
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
                                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
                             }else{
-                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
+                                return ''
                             }
                         },minWidth: 300,align:'center'}
                 ]]
@@ -155,6 +183,7 @@
                 name: $searchForm.find('input[name="name"]').val().trim(),
                 phone: $searchForm.find('input[name="phone"]').val().trim(),
                 status: $searchForm.find("select[name='status']").val(),
+                type: $searchForm.find("select[name='type']").val(),
             };
         }
 

--
Gitblit v1.9.1