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 | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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..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,15 +8,21 @@
<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="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="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">账号：</label>
+ <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="phone" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -26,22 +32,24 @@
<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="16">系统拨付</option>
- <option value="17">抽奖</option>
- <option value="18">积分池收益</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>
@@ -122,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) {
@@ -204,6 +214,7 @@
}
}, 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'}
]]
});
@@ -213,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