From 0a0ddc2087fa31cafb0589cf5c826f7caef1914e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 11:36:23 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |   46 +++++++++++++++++++---------------------------
 1 files changed, 19 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 8aed294..e7697fb 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -24,24 +24,17 @@
                                         <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="1">直推奖</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="16">系统</option>
                                                 <option value="14">签到</option>
-                                                <option value="15">感恩奖</option>
-                                                <option value="16">系统拨付</option>
-                                                <option value="17">抽奖</option>
-                                                <option value="18">积分池收益</option>
                                             </select>
                                         </div>
                                     </div>
@@ -51,11 +44,8 @@
                                             <select name="flowType">
                                                 <option value="">请选择</option>
                                                 <option value="1">余额</option>
-<!--                                                <option value="2">赠送积分</option>-->
+                                                <option value="2">赠送积分</option>
                                                 <option value="3">现金积分</option>
-                                                <option value="5">贡献点</option>
-<!--                                                <option value="6">补贴额度</option>-->
-<!--                                                <option value="4">佣金</option>-->
                                             </select>
                                         </div>
                                     </div>
@@ -125,22 +115,23 @@
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+                    {field: 'fromMemberName', title: '来自', minWidth: 150,align:'left'},
                     {field: 'type', title: '流水类型',
                         templet: function (d) {
                             if (d.type === 1) {
-                                return '<span>静态收益</span>'
-                            } else if (d.type === 2) {
                                 return '<span>直推奖</span>'
+                            } else if (d.type === 2) {
+                                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>'
                             }else if (d.type === 9) {
@@ -195,15 +186,16 @@
                         templet: function (d) {
                             if (d.flowType === 1) {
                                 return '余额';
+                            } else if(d.flowType === 2) {
+                                return '赠送积分'
                             } else if(d.flowType === 3) {
                                 return '现金积分'
-                            } else if(d.flowType === 5) {
-                                return '贡献点'
                             } else {
                                 return '-';
                             }
                         }, minWidth: 80,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+                    {field: 'remark', title: '备注', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });

--
Gitblit v1.9.1