Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_m...

Helius

2020-12-02 2134646bc453037bbf25df37b4aef96e7236faa4

Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into outcenter-bak

 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


 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) {


 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>


 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">&#xe7a4;</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">&#xe7a4;</i>'