From 8bb4b36a259aa2eeca225ebd44af6c2500708ffd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 20 Feb 2024 14:36:24 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 152 ++++++++++++++++++++++++++------------------------
1 files changed, 79 insertions(+), 73 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 8eb1a87..53d5972 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -49,6 +49,16 @@
</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="3">积分</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">开始时间</label>
@@ -65,18 +75,6 @@
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</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">
@@ -156,68 +154,76 @@
{field: 'amount', title: '金额', minWidth: 150,align:'left', totalRow:true},
{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 === 3) {
- return '<span>代理收益</span>'
- } else if (d.type === 4) {
- return '<span>排名收益</span>'
- }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 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 if (d.type === 17) {
- return '<span>抽奖</span>'
- }else if (d.type === 18) {
- return '<span>充值</span>'
- }else if (d.type === 19) {
- return '<span>收益</span>'
- }else if (d.type === 20) {
- return '<span>赠送金额</span>'
- }else if (d.type === 21) {
- return '<span>微信支付</span>'
- }else if (d.type === 22) {
- return '<span>微信退款</span>'
- }else{
- return ''
+ if (d.flowType === 3) {
+ if (d.type === 1) {
+ return '<span>积分支付</span>'
+ } else if (d.type === 2) {
+ return '<span>购买商品获得积分</span>'
+ } else if (d.type === 3) {
+ return '<span>推荐下单获得积分</span>'
+ }
+ }
+
+ if (d.flowType === 1) {
+ if (d.type === 1) {
+ return '<span>静态收益</span>'
+ } else if (d.type === 2) {
+ return '<span>直推奖</span>'
+ } else if (d.type === 3) {
+ return '<span>代理收益</span>'
+ } else if (d.type === 4) {
+ return '<span>排名收益</span>'
+ }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 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 if (d.type === 17) {
+ return '<span>抽奖</span>'
+ }else if (d.type === 18) {
+ return '<span>充值</span>'
+ }else if (d.type === 19) {
+ return '<span>收益</span>'
+ }else if (d.type === 20) {
+ return '<span>赠送金额</span>'
+ }else if (d.type === 21) {
+ return '<span>微信支付</span>'
+ }else if (d.type === 22) {
+ return '<span>微信退款</span>'
+ }else{
+ return ''
+ }
}
}, minWidth: 80,align:'center'},
- // {field: 'flowType', title: '资金类型',
- // templet: function (d) {
- // 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: 'flowType', title: '资金类型',
+ templet: function (d) {
+ if (d.flowType === 1) {
+ return '余额';
+ } else if(d.flowType === 3) {
+ return '积分'
+ } else {
+ return '-';
+ }
+ }, minWidth: 80,align:'center'},
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
]]
@@ -238,7 +244,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(),
+ flowType: $searchForm.find("select[name='flowType']").val(),
};
}
--
Gitblit v1.9.1