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 | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 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 e2c4b21..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">
@@ -35,22 +45,6 @@
</div>
</div>
</div>
-<!-- 表格字段状态格式化 start -->
-<script type="text/html" id="status">
- {{#
- var status = {
- 1: {title: '已到账' , color: 'green'},
- 0: {title: '已到账' },
- 2: {title: '已到账' },
- 3: {title: '已到账' },
- 4: {title: '已到账' }
- }[d.status];
- }}
- <span class="layui-badge febs-tag-{{status.color}}">{{ status.title }}</span>
-</script>
-
-<!-- 表格字段状态格式化 start -->
-
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -92,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() {
@@ -102,17 +94,16 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'member/memberApplyCoin',
+ totalRow: true,
cols: [[
- {field: 'phone', title: '手机号码', minWidth: 120,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ {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: 'amount', title: '充币数量', minWidth: 100,align:'center'},
- {field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
+ {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},
{field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},
- {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'},
- {title: '状态', templet: '#status', minWidth: 100,align:'center'}
+ {field: 'createTime', title: '创建时间', minWidth: 200,align:'center'}
]]
});
}
@@ -122,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