From cedd63e6a0275eb7b32f10ab9b2bc22e30fb42c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Sep 2022 10:42:25 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |   95 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 07791c0..48d958e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -18,15 +18,40 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">账户状态</label>
+                                        <label class="layui-form-label layui-form-label-sm">流水类型</label>
                                         <div class="layui-input-inline">
                                             <select name="type">
                                                 <option value="">请选择</option>
-                                                <option value="1">分红收入</option>
-                                                <option value="2">业绩奖励</option>
-                                                <option value="3">订单支付</option>
-                                                <option value="4">退款</option>
-                                                <option value="5">转账</option>
+                                                <option value="1">静态收益</option>
+                                                <option value="2">直推奖</option>
+                                                <option value="3">代理收益</option>
+                                                <option value="4">排名收益</option>
+                                                <option value="5">总监收益</option>
+                                                <option value="6">社区店补</option>
+                                                <option value="7">一代收益</option>
+                                                <option value="8">提现</option>
+                                                <option value="9">转账</option>
+                                                <option value="10">支付</option>
+                                                <option value="11">退款</option>
+                                                <option value="12">佣金转竞猜积分</option>
+                                                <option value="13">佣金转余额</option>
+                                                <option value="14">竞猜积分签到</option>
+                                                <option value="15">感恩奖</option>
+                                                <option value="16">系统拨付</option>
+                                                <option value="17">抽奖</option>
+                                                <option value="18">积分池收益</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">资金类型</label>
+                                        <div class="layui-input-inline">
+                                            <select name="flowType">
+                                                <option value="">请选择</option>
+                                                <option value="1">余额</option>
+                                                <option value="2">赠送积分</option>
+                                                <option value="3">竞猜积分</option>
+                                                <option value="4">佣金</option>
                                             </select>
                                         </div>
                                     </div>
@@ -94,32 +119,65 @@
                 url: ctx + 'admin/mallMember/getMoneyFlowList',
                 cols: [[
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
-                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                     {field: 'type', title: '流水类型',
                         templet: function (d) {
                             if (d.type === 1) {
-                                return '<span>分红收入</span>'
+                                return '<span>静态收益</span>'
                             } else if (d.type === 2) {
-                                return '<span>业绩奖励</span>'
+                                return '<span>直推奖</span>'
                             } else if (d.type === 3) {
-                                return '<span>订单支付</span>'
+                                return '<span>代理收益</span>'
                             } else if (d.type === 4) {
-                                return '<span>退款</span>'
-                            } else if (d.type === 5) {
+                                return '<span>排名收益</span>'
+                            }else if (d.type === 5) {
+                                return '<span>总监收益</span>'
+                            }else if (d.type === 6) {
+                                return '<span>社区店补</span>'
+                            }else if (d.type === 7) {
+                                return '<span>一代收益</span>'
+                            }else if (d.type === 8) {
+                                return '<span>提现</span>'
+                            }else if (d.type === 9) {
                                 return '<span>转账</span>'
-                            } else{
+                            }else if (d.type === 10) {
+                                return '<span>支付</span>'
+                            }else if (d.type === 11) {
+                                return '<span>退款</span>'
+                            }else if (d.type === 12) {
+                                return '<span>佣金转竞猜积分</span>'
+                            }else if (d.type === 13) {
+                                return '<span>佣金转余额</span>'
+                            }else if (d.type === 14) {
+                                return '<span>竞猜积分签到</span>'
+                            }else if (d.type === 15) {
+                                return '<span>感恩奖</span>'
+                            }else if (d.type === 16) {
+                                return '<span>系统拨付</span>'
+                            }else if (d.type === 17) {
+                                return '<span>抽奖</span>'
+                            }else if (d.type === 18) {
+                                return '<span>积分池收益</span>'
+                            }else{
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'type', title: '支付方式',
+                    {field: 'flowType', title: '资金类型',
                         templet: function (d) {
-                            if (d.type === 3) {
-                                return '<span>'+d.payMethod+'</span>'
-                            } else{
-                                return ''
+                            if (d.flowType === 1) {
+                                return '余额';
+                            } else if(d.flowType === 2) {
+                                return '赠送积分'
+                            } else if(d.flowType === 3) {
+                                return '竞猜积分'
+                            } else if(d.flowType === 4) {
+                                return '佣金'
+                            } else {
+                                return '-';
                             }
                         }, minWidth: 80,align:'center'},
+                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });
@@ -131,6 +189,7 @@
                 name: $searchForm.find('input[name="name"]').val().trim(),
                 phone: $searchForm.find('input[name="phone"]').val().trim(),
                 type: $searchForm.find("select[name='type']").val(),
+                flowType: $searchForm.find("select[name='flowType']").val(),
             };
         }
 

--
Gitblit v1.9.1