From a0e33f06495287496a2e81ef5675b4cf7a2dfe5c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 17:48:37 +0800
Subject: [PATCH] 资金流水修改
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 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 8bf178f..44c49d4 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -33,8 +33,8 @@
<!-- <option value="7">一代收益</option>-->
<!-- <option value="8">提现</option>-->
<!-- <option value="9">转账</option>-->
- <option value="10">支付</option>
-<!-- <option value="11">退款</option>-->
+ <option value="10">余额支付</option>
+ <option value="11">退款</option>
<!-- <option value="12">佣金转竞猜积分</option>-->
<!-- <option value="13">佣金转余额</option>-->
<!-- <option value="14">竞猜积分签到</option>-->
@@ -43,8 +43,25 @@
<!-- <option value="17">抽奖</option>-->
<option value="18">充值</option>
<option value="20">赠送金额</option>
+ <option value="21">微信支付</option>
<!-- <option value="19">收益</option>-->
</select>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <div class="layui-input-inline">
+ <input type="text" name="startTime" id="febs-money-flow-start" lay-verify="date"
+ 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">
+ <input type="text" name="endTime" id="febs-money-flow-end" lay-verify="date"
+ placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
<!-- <div class="layui-inline">-->
@@ -80,7 +97,7 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs','laydate'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -90,7 +107,17 @@
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
+ laydate = layui.laydate,
tableIns;
+
+ //日期范围
+ laydate.render({
+ elem: '#febs-money-flow-start'
+ });
+
+ laydate.render({
+ elem: '#febs-money-flow-end'
+ });
form.render();
@@ -121,10 +148,11 @@
elem: $view.find('table'),
id: 'moneyFlowTable',
url: ctx + 'admin/mallMember/getMoneyFlowList',
+ totalRow : true,
cols: [[
- {field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
+ {field: 'name', title: '用户昵称', minWidth: 100,align:'left',totalRowText:"合计"},
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
- {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+ {field: 'amount', title: '金额', minWidth: 150,align:'left', totalRow:true},
{field: 'type', title: '流水类型',
templet: function (d) {
if (d.type === 1) {
@@ -146,7 +174,7 @@
}else if (d.type === 9) {
return '<span>转账</span>'
}else if (d.type === 10) {
- return '<span>支付</span>'
+ return '<span>余额支付</span>'
}else if (d.type === 11) {
return '<span>退款</span>'
}else if (d.type === 12) {
@@ -167,6 +195,8 @@
return '<span>收益</span>'
}else if (d.type === 20) {
return '<span>赠送金额</span>'
+ }else if (d.type === 21) {
+ return '<span>微信支付</span>'
}else{
return ''
}
@@ -193,7 +223,15 @@
// 获取查询参数
function getQueryParams() {
+ let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
+ let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
+ if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
+ febs.alert.warn('开始时间需要小于结束时间');
+ return{};
+ }
return {
+ startTime: $searchForm.find('input[name="startTime"]').val().trim(),
+ endTime: $searchForm.find('input[name="endTime"]').val().trim(),
name: $searchForm.find('input[name="name"]').val().trim(),
phone: $searchForm.find('input[name="phone"]').val().trim(),
type: $searchForm.find("select[name='type']").val(),
--
Gitblit v1.9.1