From c9cb5828802dcae2ccca8f9344f97a2d06da974b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Nov 2020 17:23:38 +0800
Subject: [PATCH] Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage.git into outcenter-bak
---
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index c339f6d..6a721da 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -9,7 +9,13 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="邀请码" name="account" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" placeholder="提币地址" name="address" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -20,16 +26,6 @@
<option value="1">等待审核</option>
<option value="2">同意</option>
<option value="3">拒绝</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账号类型</label>
- <div class="layui-input-inline">
- <select name="isTest">
- <option value=""></option>
- <option value="1">正常账号</option>
- <option value="2">测试账号</option>
</select>
</div>
</div>
@@ -67,11 +63,10 @@
<!-- <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
<!-- </span>-->
{{# if(d.status === 1) { }}
- <a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>
- <a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>
- <a lay-event="examine" >查看</a>
+ <a lay-event="confirm" shiro:hasPermission="coin:check" >确认</a>
+ <a lay-event="cancel" shiro:hasPermission="coin:check" >拒绝</a>
{{# } else { }}
- <a lay-event="examine" >查看</a>
+
{{# } }}
</script>
<!-- 表格操作栏 end -->
@@ -150,9 +145,9 @@
url: ctx + 'member/memberWithdrawCoin',
totalRow: true,
cols: [[
- {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
- {field: 'realName', title: '姓名', minWidth: 50,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
+ // {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ //{field: 'realName', title: '姓名', minWidth: 50,align:'left'},
+ // {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
// if (d.accountType === 2) {
@@ -167,11 +162,13 @@
templet: function (d) {
if (d.isInside === 'Y') {
return '<span style="color:red;">是</span>'
- } else {
+ } else if(d.isInside === 'J') {
+ return '<span style="color:red;">算力</span>'
+ }else{
return '<span style="color:green;">否</span>'
}
},minWidth: 100,align:'center'},
- {field: 'insidePhone', title: '内部账户', minWidth: 120,align:'center' },
+ // {field: 'insidePhone', title: '内部账户', minWidth: 120,align:'center' },
{field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
{field: 'realAmount', title: '到账金额', minWidth: 120,align:'center' ,totalRow: true},
{field: 'address', title: '提币地址', minWidth: 300,align:'center'},
@@ -187,7 +184,7 @@
return '<span style="color:red;">拒绝</span>'
}
},minWidth: 100,align:'center'},
- {title: '操作', toolbar: '#user-option'
+ // {title: '操作', toolbar: '#user-option'
// templet: function (d) {
// if (d.status === 1) {
// return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'
@@ -198,7 +195,7 @@
// return '<a lay-event="examine" >查看</a>'
// }
// }
- ,minWidth: 200,align:'center'}
+ // ,minWidth: 200,align:'center'}
]]
});
}
@@ -207,6 +204,7 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
+ address: $searchForm.find('input[name="address"]').val().trim(),
status: $searchForm.find("select[name='statusOption']").val(),
isTest: $searchForm.find("select[name='isTest']").val(),
isInside: $searchForm.find("select[name='isInsideOption']").val()
--
Gitblit v1.9.1