From 076f5a4f0a7c5a4d3a6d3a1a61ff96a0091e3320 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 06 May 2023 15:04:21 +0800
Subject: [PATCH] 星级补贴逻辑修改
---
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 5e4e4d2..7d9317e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.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">
@@ -50,6 +56,7 @@
</div>
<script type="text/html" id="charge-flow-list-option">
{{# if(d.status === 1) { }}
+<!-- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>-->
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="accountInfo:view" lay-event="accountInfo">账户余额</button>
@@ -87,9 +94,20 @@
table.on('tool(moneyFlowChargeTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
+ // if (layEvent === 'chargeAgree') {
+ // febs.modal.confirm('同意', '同意提现？', function () {
+ // chargeAgree(data.id);
+ // });
+ // }
if (layEvent === 'chargeAgree') {
- febs.modal.confirm('同意', '同意提现？', function () {
- chargeAgree(data.id);
+ febs.modal.open( '提现方式', 'modules/mallMember/chargeFlowListType/' + data.id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#charge-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
});
}
if (layEvent === 'chargeDisagree') {
@@ -117,16 +135,16 @@
febs.get(ctx + 'admin/mallMember/searchInfo/' + id, null, function (data) {
febs.alert.success(data.message);
// febs.alert.success('操作成功');
- window.location.reload();
- // $query.click();
+ // window.location.reload();
+ $query.click();
});
}
function accountInfo(id) {
febs.get(ctx + 'admin/mallMember/accountInfo/' + id, null, function (data) {
febs.alert.success(data.message);
// febs.alert.success('操作成功');
- window.location.reload();
- // $query.click();
+ // window.location.reload();
+ $query.click();
});
}
function chargeAgree(id) {
@@ -164,9 +182,10 @@
totalRow: true ,// 开启合计行
cols: [[
{field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计：'},
+ {field: 'accountLogin', title: '登录账户', minWidth: 100,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
+ // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
{field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
{field: 'remark', title: '类型', minWidth: 150,align:'left'},
@@ -192,6 +211,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(),
status: $searchForm.find("select[name='status']").val(),
};
--
Gitblit v1.9.1