Merge remote-tracking branch 'origin/roc-bak' into roc-bak

zainali5120

2020-11-11 0730d0e9b5714394241cb3a19f3be38a40c46f7c

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

@@ -12,6 +12,12 @@
                                            <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">

                                        <label class="layui-form-label layui-form-label-sm">状态</label>

                                        <div class="layui-input-inline">

@@ -53,12 +59,16 @@
</div>

<!-- 表格操作栏 start -->

<script type="text/html" id="user-option">

    <span shiro:lacksPermission="user:view,user:update,user:delete">

        <span class="layui-badge-dot febs-bg-orange"></span> 无权限

    </span>

   <a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>

   <i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>

   <a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>

<!--    <span shiro:lacksPermission="coin:check">-->

<!--        <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>

    {{# } else { }}

        <a lay-event="examine" >查看</a>

    {{# } }}

</script>

<!-- 表格操作栏 end -->

<script data-th-inline="none" type="text/javascript">

@@ -126,8 +136,7 @@
        // 刷新按钮

        $reset.on('click', function () {

            $searchForm[0].reset();

            sortObject.type = 'null';

            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});

            tableIns.reload({where: getQueryParams(), page: {curr: 1}});

        });



        function initTable() {

@@ -138,15 +147,16 @@
                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                    {field: 'accountType', title: '账号类型',

                        templet: function(d) {

                            if (d.accountType === 1) {

                                return "正常账号";

                            } else {

                                return "测试账号";

                            }

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

                    {field: 'realName', title: '姓名', minWidth: 50,align:'left'},

                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},

                    // {field: 'accountType', title: '账号类型',

                    //    templet: function (d) {

                    //         if (d.accountType === 2) {

                    //             return '<span style="color:red;">测试账号</span>'

                    //         } else {

                    //             return '<span style="color:green;">正常账号</span>'

                    //         }

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

                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'isInside', title: '内部转账',

@@ -157,6 +167,7 @@
                                return '<span style="color:green;">否</span>'

                            }

                        },minWidth: 100,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'},

@@ -172,17 +183,18 @@
                                return '<span style="color:red;">拒绝</span>'

                            }

                        },minWidth: 100,align:'center'},

                    {title: '操作', 
                       templet: function (d) {

                            if (d.status === 1) {

                               return '<a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>'

                               +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'

                               +'<a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>'

                               +'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'

                            }else {

                                return ''

                            }

                        },minWidth: 200,align:'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'}

                    {title: '操作', toolbar: '#user-option'

                       // 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>'

                        //        +'<a lay-event="cancel" shiro:hasPermission="coin:check">拒绝</a>'

                        //        +'<a lay-event="examine" >查看</a>'

                        //     }else {

                        //         return '<a lay-event="examine" >查看</a>'

                        //     }

                        // }

                        ,minWidth: 200,align:'center'}

                ]]

            });

        }

@@ -191,7 +203,9 @@
        function getQueryParams() {

            return {

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

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

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

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

               isInside: $searchForm.find("select[name='isInsideOption']").val()

            };

        }