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

xiaoyong931011

2020-11-30 c9cb5828802dcae2ccca8f9344f97a2d06da974b

 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html

@@ -9,15 +9,10 @@
                                <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="insidePhone" 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">

@@ -68,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 -->

@@ -151,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) {

@@ -168,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'},

@@ -188,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>'

@@ -199,7 +195,7 @@
                        //         return '<a lay-event="examine" >查看</a>'

                        //     }

                        // }

                        ,minWidth: 200,align:'center'}

                     //   ,minWidth: 200,align:'center'}

                ]]

            });

        }

@@ -208,7 +204,6 @@
        function getQueryParams() {

            return {

               account: $searchForm.find('input[name="account"]').val().trim(),

                insidePhone: $searchForm.find('input[name="insidePhone"]').val().trim(),

                address: $searchForm.find('input[name="address"]').val().trim(),

               status: $searchForm.find("select[name='statusOption']").val(),

               isTest: $searchForm.find("select[name='isTest']").val(),