From 89e2b353cb22e38dbe0a7144b26fa69766cf7f9b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 10:12:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..4a75d57 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,13 @@
<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>
</select>
</div>
</div>
@@ -99,23 +101,31 @@
{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{
+ }else if (d.type === 6) {
+ return '<span>提现</span>'
+ }else if (d.type === 7) {
+ return '<span>排名奖励</span>'
+ }else{
return ''
}
}, minWidth: 80,align:'center'},
{field: 'type', title: '支付方式',
templet: function (d) {
if (d.type === 3) {
- return '<span>'+d.payMethod+'</span>'
+ if(d.payMethod === null || d.payMethod ===''){
+ return ''
+ }else{
+ return '<span>'+d.payMethod+'</span>'
+ }
} else{
return ''
}
--
Gitblit v1.9.1