From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak
---
src/main/resources/templates/febs/views/modules/member/applyCoin.html | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/member/applyCoin.html b/src/main/resources/templates/febs/views/modules/member/applyCoin.html
index ac9c4be..edf94db 100644
--- a/src/main/resources/templates/febs/views/modules/member/applyCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/applyCoin.html
@@ -17,6 +17,16 @@
<input type="text" placeholder="充币地址" name="address" 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">
+ <select name="symbol">
+ <option value=""></option>
+ <option value="USDT">USDT</option>
+ <option value="ROC">ROC</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -76,9 +86,7 @@
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
- treeSelect.revokeNode('dept');
- sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
});
function initTable() {
@@ -89,22 +97,13 @@
totalRow: true,
cols: [[
{field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
- {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+ {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
- {field: 'symbol', title: '币种', minWidth: 60,align:'center'},
- {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
{field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},
- {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},
{field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},
- {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},
- {field: 'status', title: '状态',
- templet: function (d) {
- if (d.status === 1) {
- return '<span style="color:green;">已到账</span>'
- } else {
- return ''
- }
- }, minWidth: 200,align:'center'},
+ {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'}
]]
});
}
@@ -114,6 +113,7 @@
return {
account: $searchForm.find('input[name="account"]').val().trim(),
address: $searchForm.find('input[name="address"]').val().trim(),
+ symbol: $searchForm.find("select[name='symbol']").val()
};
}
--
Gitblit v1.9.1