From 3d51d141bc43d68a738cd15183254f1b980bcb92 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 16:21:59 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |   90 +++++++++++++++++++++++++++++++-------------
 1 files changed, 63 insertions(+), 27 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 ce8cf2a..f18c7ab 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -18,19 +18,38 @@
                                         </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="6">提现</option>
-                                                <option value="7">排名奖励</option>
-                                                <option value="8">利润分红</option>
-                                                <option value="9">系统拨付</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>
+                                            </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>
@@ -104,37 +123,53 @@
                     {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>'
+                                return '<span>排名收益</span>'
                             }else if (d.type === 5) {
-                                return '<span>转账</span>'
+                                return '<span>董事收益</span>'
                             }else if (d.type === 6) {
-                                return '<span>提现</span>'
+                                return '<span>社区店补</span>'
                             }else if (d.type === 7) {
-                                return '<span>排名奖励</span>'
+                                return '<span>推荐人收益</span>'
                             }else if (d.type === 8) {
-                                return '<span>利润分红</span>'
+                                return '<span>提现</span>'
                             }else if (d.type === 9) {
+                                return '<span>转账</span>'
+                            }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{
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'type', title: '支付方式',
+                    {field: 'flowType', title: '资金类型',
                         templet: function (d) {
-                            if (d.type === 3) {
-                                if(d.payMethod === null || d.payMethod ===''){
-                                    return ''
-                                }else{
-                                    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'},
@@ -149,6 +184,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