Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

Helius

2021-09-28 89e2b353cb22e38dbe0a7144b26fa69766cf7f9b

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html

@@ -47,9 +47,9 @@
                    {field: 'type', title: '流水类型',
                        templet: function (d) {
                            if (d.type === 1) {
                                return '<span>分红收入</span>'
                                return '<span>直推奖励</span>'
                            } else if (d.type === 2) {
                                return '<span>业绩奖励</span>'
                                return '<span>团队奖励</span>'
                            } else if (d.type === 3) {
                                return '<span>订单支付</span>'
                            } else if (d.type === 4) {
@@ -58,6 +58,8 @@
                                return '<span>转账</span>'
                            }else if (d.type === 6) {
                                return '<span>提现</span>'
                            }else if (d.type === 7) {
                                return '<span>排名奖励</span>'
                            }else{
                                return ''
                            }