From 2134646bc453037bbf25df37b4aef96e7236faa4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 02 Dec 2020 17:48:57 +0800
Subject: [PATCH] Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into outcenter-bak
---
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 3 +--
src/main/resources/templates/febs/views/modules/member/member.html | 2 +-
src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html | 4 ++--
src/main/resources/mapper/modules/MemberMapper.xml | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 079d96c..7b8b682 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -6,7 +6,7 @@
SELECT
*,
(select available_balance+frozen_balance from member_wallet_coin where wallet_code='USDT' and member_id = m.id) usdtBalance,
- (select available_balance+frozen_balance from member_wallet_coin where wallet_code='ROC' and member_id = m.id) rocBalance
+ (select available_balance+frozen_balance from member_wallet_coin where wallet_code='SER' and member_id = m.id) rocBalance
FROM
member m
LEFT JOIN member_authentication a ON m.id = a.member_id
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 9a17510..bbdbc75 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -124,7 +124,7 @@
return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
}, minWidth: 80,align:'center'},
{field: 'usdtBalance', title: 'USDT余额', minWidth: 80,align:'center'},
- {field: 'rocBalance', title: 'ROC余额', minWidth: 80,align:'center'},
+ {field: 'rocBalance', title: 'SER余额', minWidth: 80,align:'center'},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
// if (d.accountType === 2) {
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html b/src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html
index 1f7b7c3..2b4bd92 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDetailInfo.html
@@ -27,7 +27,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">ROC余额：</label>
+ <label class="layui-form-label febs-form-item-require">SER余额：</label>
<div class="layui-input-block">
<input type="text" name="walletCoinNumRoc" minlength="4" maxlength="10" data-th-id="${member.walletCoinNumRoc}"
lay-verify="range|walletCoinNumRoc" autocomplete="off" class="layui-input" readonly>
@@ -42,7 +42,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">充币ROC：</label>
+ <label class="layui-form-label febs-form-item-require">充币SER：</label>
<div class="layui-input-block">
<input type="text" name="chargeCoinRoc" minlength="4" maxlength="10" data-th-id="${member.chargeCoinRoc}"
lay-verify="range|chargeCoinRoc" autocomplete="off" class="layui-input" readonly>
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 04b709c..9d77789 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -63,7 +63,6 @@
<!-- <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
<!-- </span>-->
<a lay-event="confirm" shiro:hasPermission="coin:check" >确认</a>
- <i class="layui-icon febs-edit-area febs-blue"></i>
<a lay-event="cancel" shiro:hasPermission="coin:check" >拒绝</a>
</script>
@@ -182,7 +181,7 @@
return '<span style="color:red;">拒绝</span>'
}
},minWidth: 100,align:'center'},
- {title: '操作', toolbar: '#user-option',templet: function (d) {
+ {title: '操作',templet: function (d) {
if (d.status === 1) {
return '<a lay-event="confirm" shiro:hasPermission="coin:check">确认</a>'
+'<i class="layui-icon febs-edit-area febs-blue"></i>'
--
Gitblit v1.9.1