From 7e6bbd05a75b07cb0717812d0b51aad128361012 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 19 May 2022 18:43:42 +0800
Subject: [PATCH] fix some problem

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 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 c998a7d..ce8cf2a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -22,11 +22,15 @@
                                         <div class="layui-input-inline">
                                             <select name="type">
                                                 <option value="">请选择</option>
-                                                <option value="1">分红收入</option>
-                                                <option value="2">业绩奖励</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>
                                             </select>
                                         </div>
                                     </div>
@@ -94,24 +98,46 @@
                 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: '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>'
                             } else if (d.type === 4) {
                                 return '<span>退款</span>'
-                            } else if (d.type === 5) {
+                            }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{
+                                return ''
+                            }
+                        }, minWidth: 80,align:'center'},
+                    {field: 'type', title: '支付方式',
+                        templet: function (d) {
+                            if (d.type === 3) {
+                                if(d.payMethod === null || d.payMethod ===''){
+                                    return ''
+                                }else{
+                                    return '<span>'+d.payMethod+'</span>'
+                                }
                             } else{
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
+                    {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
             });

--
Gitblit v1.9.1