From e94e6721a4aeb8c21e97878239ec3429fc76d1ad Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 May 2023 14:23:45 +0800
Subject: [PATCH] 创建订单之前的判断修改
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 90 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 23 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 17c0417..107977e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,48 +8,62 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">登录账户：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="登录账户" name="accountLogin" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">流水类型</label>
+ <label class="layui-form-label">手机号码：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="手机号码" name="phone" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">流水类型：</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="9">转账</option>
<option value="10">支付</option>
<option value="11">退款</option>
- <option value="12">佣金转竞猜积分</option>
- <option value="13">佣金转余额</option>
- <option value="14">竞猜积分签到</option>
- <option value="15">感恩奖</option>
+ <option value="14">签到</option>
<option value="16">系统拨付</option>
+ <option value="19">1星合伙人补贴</option>
+ <option value="20">2星合伙人补贴</option>
+ <option value="21">3星合伙人补贴</option>
+ <option value="22">4星合伙人补贴</option>
+ <option value="23">5星合伙人补贴</option>
+ <option value="24">6星合伙人补贴</option>
+ <option value="25">贡献点</option>
+ <option value="26">补贴额度</option>
+ <option value="27">团队补贴</option>
+ <option value="28">平级奖励补贴</option>
+ <option value="29">线下服务中心补贴</option>
+ <option value="30">代理商补贴</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">资金类型</label>
+ <label class="layui-form-label">资金类型：</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>
+<!-- <option value="2">赠送积分</option>-->
+ <option value="3">现金积分</option>
+ <option value="5">贡献点</option>
+<!-- <option value="6">补贴额度</option>-->
+<!-- <option value="4">佣金</option>-->
</select>
</div>
</div>
@@ -116,9 +130,11 @@
id: 'moneyFlowTable',
url: ctx + 'admin/mallMember/getMoneyFlowList',
cols: [[
+ {field: 'accountLogin', title: '登录账户', minWidth: 100,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '账号', minWidth: 150,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) {
@@ -148,11 +164,39 @@
}else if (d.type === 13) {
return '<span>佣金转余额</span>'
}else if (d.type === 14) {
- return '<span>竞猜积分签到</span>'
+ 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>1星合伙人补贴</span>'
+ }else if (d.type === 20) {
+ return '<span>2星合伙人补贴</span>'
+ }else if (d.type === 21) {
+ return '<span>3星合伙人补贴</span>'
+ }else if (d.type === 22) {
+ return '<span>4星合伙人补贴</span>'
+ }else if (d.type === 23) {
+ return '<span>5星合伙人补贴</span>'
+ }else if (d.type === 24) {
+ return '<span>6星合伙人补贴</span>'
+ }else if (d.type === 25) {
+ return '<span>贡献点</span>'
+ }else if (d.type === 26) {
+ return '<span>补贴额度</span>'
+ }else if (d.type === 27) {
+ return '<span>团队补贴</span>'
+ }else if (d.type === 28) {
+ return '<span>平级奖励补贴</span>'
+ }else if (d.type === 29) {
+ return '<span>线下服务中心补贴</span>'
+ }else if (d.type === 30) {
+ return '<span>代理商补贴</span>'
}else{
return ''
}
@@ -161,17 +205,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 === 4) {
- return '佣金'
+ 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'}
]]
});
@@ -181,6 +224,7 @@
function getQueryParams() {
return {
name: $searchForm.find('input[name="name"]').val().trim(),
+ accountLogin: $searchForm.find('input[name="accountLogin"]').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