From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index 1e9fea5..0fdea4d 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -47,19 +47,19 @@
                     {field: 'type', title: '流水类型',
                         templet: function (d) {
                             if (d.type === 1) {
-                                return '<span>静态收益</span>'
-                            } else if (d.type === 2) {
                                 return '<span>直推奖</span>'
+                            } else if (d.type === 2) {
+                                return '<span>隔代收益</span>'
                             } else if (d.type === 3) {
-                                return '<span>代理收益</span>'
+                                return '<span>全网分红</span>'
                             } else if (d.type === 4) {
-                                return '<span>排名收益</span>'
+                                return '<span>代理分红</span>'
                             }else if (d.type === 5) {
-                                return '<span>总监收益</span>'
+                                return '<span>股东分红</span>'
                             }else if (d.type === 6) {
-                                return '<span>社区店补</span>'
+                                return '<span>积分兑换</span>'
                             }else if (d.type === 7) {
-                                return '<span>一代收益</span>'
+                                return '<span>推荐奖</span>'
                             }else if (d.type === 8) {
                                 return '<span>提现</span>'
                             }else if (d.type === 9) {
@@ -114,10 +114,10 @@
                         templet: function (d) {
                             if (d.flowType === 1) {
                                 return '余额';
+                            } else if(d.flowType === 2) {
+                                return '赠送积分'
                             } else if(d.flowType === 3) {
                                 return '现金积分'
-                            } else if(d.flowType === 5) {
-                                return '贡献点'
                             } else {
                                 return '-';
                             }

--
Gitblit v1.9.1