20200623 代码提交

xiaoyong931011

2020-06-23 74a515f13ad8b5a38c6e4379de0927cec93ce62f

20200623   代码提交

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

@@ -19,7 +19,6 @@
                                                <option value="0"></option>

                                                <option value="1">新建</option>

                                                <option value="2">已付款</option>

                                                <option value="3">已审核</option>

                                                <option value="4">撤单</option>

                                                <option value="5">系统取消</option>

                                            </select>

@@ -53,7 +52,6 @@
    var orderStatus = {

    1: {title: '新建' , color: 'gray'},

    2: {title: '已付款' , color: 'red'},

    3: {title: '已审核' , color: 'green'},

    4: {title: '撤单' , color: 'gray'},

    5: {title: '系统取消' , color: 'blue'}

    }[d.orderStatus];

@@ -177,7 +175,16 @@
                    {field: 'paymentName', title: '收款人', minWidth: 150,align:'center'},

                    {field: 'paymentAccount', title: '收款账号', minWidth: 150,align:'center'},

                    {title: '收款方式', templet: '#payment-Type', minWidth: 100,align:'center'},

                    {title: '操作', toolbar: '#user-option', minWidth: 150, fixed : 'right'}

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

                            if (d.orderStatus === 2) {

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

                            }else {

                                return ''

                            }

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

                ]]

            });

        }


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

@@ -181,7 +181,16 @@
                    {field: 'account', title: '收款账号', minWidth: 150,align:'center'},

                    {field: 'paymentAccount', title: '二维码', minWidth: 150,align:'center'},

                    {field: 'bank', title: '所属银行', minWidth: 150,align:'center'},

                    {title: '操作', toolbar: '#user-option', minWidth: 150, fixed : 'right'}

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

                            if (d.orderStatus === 2) {

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

                            }else {

                                return ''

                            }

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

                ]]

            });

        }


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

@@ -109,6 +109,11 @@
                    }
                });
            }
            if (layEvent === 'see') {
                febs.modal.open('身份认证', 'modules/member/memberDetail/' + data.id, {
                    area: $(window).width() <= 1000 ? '100%' : '50%',
                });
            }
        });
        

@@ -139,7 +144,17 @@
                    {title: '账号状态', templet: '#account-status', minWidth: 50,align:'center'},
                    {title: '审核状态', templet: '#certify-status', minWidth: 80,align:'center'},
                    {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
                    {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
                    {title: '操作', 
                        templet: function (d) {
                            if (d.certifyStatus === 1) {
                                return '<a lay-event="edit" shiro:hasPermission="user:update">确认</a>'
                            }else if(d.certifyStatus === 2){
                                return '<a lay-event="see" shiro:hasPermission="user:update">'
                                +'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'
                            }else {
                                return ''
                            }
                        },minWidth: 200,align:'center'}
                ]]
            });
        }

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

@@ -175,7 +175,16 @@
                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},

                    {title: '内部转账', templet: '#isInside', minWidth: 100,align:'center'},

                    {title: '状态', templet: '#status', minWidth: 100,align:'center'},

                    {title: '操作', toolbar: '#user-option', minWidth: 150, fixed : 'right'}

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

                            if (d.orderStatus === 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>'

                            }else {

                                return ''

                            }

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

                ]]

            });

        }