From 73b3813c2d110bf446f251350f120bb1e2b51d0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 10:45:14 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |   76 ++++++++++++++++++++++++--------------
 1 files changed, 48 insertions(+), 28 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 59309c9..2da8aea 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -18,21 +18,37 @@
                                         </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="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="100">系统拨付</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>-->
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -98,43 +114,46 @@
                 cols: [[
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
-                    {field: 'bindPhone', 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>'
+                                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 === 100) {
+                                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 {
+                                return '-';
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+                    {field: 'orderNo', title: '编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });
@@ -146,6 +165,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