From 1fc82463c1e370a26360e8ee015be17a0dfc468c Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 11 Jun 2020 19:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin_manage.git
---
src/main/resources/templates/febs/views/modules/member/chargeUsdt.html | 211 ++++++++++++----------------------------------------
1 files changed, 51 insertions(+), 160 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
index 2427975..eaefca1 100644
--- a/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
+++ b/src/main/resources/templates/febs/views/modules/member/chargeUsdt.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="会员列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="会员充值USDT记录">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -13,16 +13,10 @@
</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="createTime" id="user-createTime" 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="orderStatus">
- <option value=""></option>
+ <option value="0"></option>
<option value="1">新建</option>
<option value="2">已付款</option>
<option value="3">已审核</option>
@@ -54,38 +48,30 @@
</div>
</div>
<!-- 表格字段状态格式化 start -->
-<script type="text/html" id="certify-status">
- {{#
- var certifyStatus = {
- 0: {title: '未通过', color: 'red'},
- 1: {title: '审核中', color: 'blue'},
- 2: {title: '审核通过', color: 'green'},
- 3: {title: '未实名', color: 'cyan'}
- }[d.certifyStatus];
- }}
- <span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
-</script>
<script type="text/html" id="order-Status">
{{#
var orderStatus = {
- 1: {title: '新建' , color: 'green'},
- 2: {title: '已付款' , color: 'red'}
+ 1: {title: '新建' , color: 'gray'},
+ 2: {title: '已付款' , color: 'red'},
3: {title: '已审核' , color: 'green'},
- 4: {title: '撤单' , color: 'red'}
- 5: {title: '系统取消' , color: 'red'}
+ 4: {title: '撤单' , color: 'gray'},
+ 5: {title: '系统取消' , color: 'blue'}
}[d.orderStatus];
}}
<span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>
</script>
-<script type="text/html" id="account-status">
+<script type="text/html" id="payment-Type">
{{#
- var accountStatus = {
- 1: {title: '正常', color : 'blue'},
- 0: {title: '禁用', color : 'red'}
- }[d.accountStatus];
+ var paymentType = {
+ null: {title: '无' },
+ 1: {title: '支付宝' },
+ 2: {title: '微信'},
+ 3: {title: '银行卡' }
+ }[d.paymentType];
}}
- <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
+ <span >{{ paymentType.title }}</span>
</script>
+
<!-- 表格字段状态格式化 start -->
<!-- 表格操作栏 start -->
@@ -93,11 +79,9 @@
<span shiro:lacksPermission="user:view,user:update,user:delete">
<span class="layui-badge-dot febs-bg-orange"></span> 无权限
</span>
- <a lay-event="detail" shiro:hasPermission="user:view"><i
- class="layui-icon febs-edit-area febs-green"></i></a>
- <a lay-event="edit" shiro:hasPermission="user:update"><i
- class="layui-icon febs-edit-area febs-blue"></i></a>
- <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red"></i></a>
+ <a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>
+ <i class="layui-icon febs-edit-area febs-blue"></i>
+ <a lay-event="cancel" shiro:hasPermission="user:delete">系统撤单</a>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -115,95 +99,12 @@
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
sortObject = {field: 'createTime', type: null},
- tableIns,
- createTimeFrom,
- createTimeTo;
+ tableIns;
form.render();
// 表格初始化
initTable();
-
- // 时间组件
- laydate.render({
- elem: '#user-createTime',
- range: true,
- trigger: 'click'
- });
-
- // 新增下拉组件
- /**
-
- dropdown.render({
- elem: $view.find('.action-more'),
- click: function (name, elem, event) {
- var checkStatus = table.checkStatus('userTable');
- if (name === 'add') {
- febs.modal.open('新增用户', 'system/user/add', {
- btn: ['提交', '重置'],
- area: $(window).width() <= 750 ? '95%' : '50%',
- offset: '30px',
- yes: function (index, layero) {
- $('#user-add').find('#submit').trigger('click');
- },
- btn2: function () {
- $('#user-add').find('#reset').trigger('click');
- return false;
- }
- });
- }
- if (name === 'delete') {
- if (!checkStatus.data.length) {
- febs.alert.warn('请选择需要删除的用户');
- } else {
- febs.modal.confirm('删除用户', '确定删除该用户？', function () {
- var userIds = [];
- layui.each(checkStatus.data, function (key, item) {
- userIds.push(item.userId)
- });
- deleteUsers(userIds.join(','));
- });
- }
- }
- if (name === 'reset') {
- if (!checkStatus.data.length) {
- febs.alert.warn('请选择需要重置密码的用户');
- } else {
- var usernames = [];
- layui.each(checkStatus.data, function (key, item) {
- usernames.push(item.username)
- });
- febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
- febs.alert.success('所选用户密码已重置为1234qwer');
- });
- }
- }
- if (name === 'export') {
- var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
- params.pageSize = $view.find(".layui-laypage-limits option:selected").val();
- params.pageNum = $view.find(".layui-laypage-em").next().html();
- febs.download(ctx + 'user/excel', params, '用户信息表.xlsx');
- }
- },
- options: [{
- name: 'add',
- title: '新增用户',
- perms: 'user:add'
- }, {
- name: 'delete',
- title: '删除用户',
- perms: 'user:delete'
- }, {
- name: 'reset',
- title: '密码重置',
- perms: 'user:password:reset'
- }, {
- name: 'export',
- title: '导出Excel',
- perms: 'user:export'
- }]
- });
- */
// 下拉框选择器
treeSelect.render({
@@ -218,30 +119,30 @@
table.on('tool(userTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
- if (layEvent === 'detail') {
- febs.modal.view('用户信息', 'system/user/detail/' + data.username, {
- area: $(window).width() <= 750 ? '95%' : '660px'
+ if (layEvent === 'confirm') {
+ febs.modal.confirm('询问', '您是否确认收款,确认拨币USDT到该会员吗？', function () {
+ confirmUsers(data.id);
});
}
- if (layEvent === 'del') {
- febs.modal.confirm('删除用户', '确定删除该用户？', function () {
- deleteUsers(data.userId);
- });
- }
- if (layEvent === 'edit') {
- febs.modal.open('修改用户', 'system/user/update/' + data.username, {
- area: $(window).width() <= 750 ? '90%' : '50%',
- offset: '30px',
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#user-update').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
+ if (layEvent === 'cancel') {
+ febs.modal.confirm('系统撤单', '您是否后台撤销该记录吗？', function () {
+ cancelUsers(data.id);
});
}
});
+
+ function confirmUsers(id) {
+ febs.get(ctx + 'member/memberChargeUsdtConfirm/' + id, null, function () {
+ febs.alert.success('划转成功');
+ $query.click();
+ });
+ }
+ function cancelUsers(id) {
+ febs.get(ctx + 'member/memberChargeUsdtCancel/' + id, null, function () {
+ febs.alert.success('设置为系统取消');
+ $query.click();
+ });
+ }
// 查询按钮
$query.on('click', function () {
@@ -254,8 +155,6 @@
$searchForm[0].reset();
treeSelect.revokeNode('dept');
sortObject.type = 'null';
- createTimeTo = null;
- createTimeFrom = null;
tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
});
@@ -265,10 +164,18 @@
id: 'userTable',
url: ctx + 'member/memberChargeUsdt',
cols: [[
- {type: 'checkbox'},
+ {field: 'phone', title: '手机号码'},
+ {field: 'email', title: '邮箱'},
{field: 'memberId', title: '邀请码UID'},
- {title: '订单状态', templet: '#order-Status'},
- {field: 'createTime', title: '下单时间', minWidth: 180},
+ {field: 'amountCny', title: '人民币金额'},
+ {field: 'amountUsdt', title: 'USDT金额'},
+ {field: 'unitPrice', title: '单价'},
+ {field: 'createTime', title: '充值时间', minWidth: 180},
+ {title: '付款状态', templet: '#order-Status'},
+ {field: 'orderNo', title: '订单编号'},
+ {field: 'paymentName', title: '收款人'},
+ {field: 'paymentAccount', title: '收款账号'},
+ {title: '收款方式', templet: '#payment-Type'},
{title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
]]
});
@@ -276,27 +183,11 @@
// 获取查询参数
function getQueryParams() {
- var createTime = $searchForm.find('input[name="createTime"]').val();
- if (createTime) {
- createTimeFrom = createTime.split(' - ')[0];
- }
return {
- startTime: createTimeFrom,
- account: $searchForm.find('input[name="account"]').val().trim(),
+ account: $searchForm.find('input[name="account"]').val().trim(),
orderStatus: $searchForm.find("select[name='orderStatus']").val(),
};
}
-
- function deleteUsers(userIds) {
- var currentUserId = currentUser.userId + '';
- if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
- febs.alert.warn('所选用户包含当前登录用户，无法删除');
- return;
- }
- febs.get(ctx + 'user/delete/' + userIds, null, function () {
- febs.alert.success('删除用户成功');
- $query.click();
- });
- }
+
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1