From 325508eb8d311e07c68cb6c352ffe519459f9edd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 17:22:37 +0800
Subject: [PATCH] 20210323  后台保留两位小数,(平台数据除外)

---
 src/main/java/com/xcong/excoin/modules/member/entity/AgentFriendRelationEntity.java |    2 ++
 src/main/resources/templates/febs/views/modules/documentary/traderProfit.html       |    2 +-
 src/main/resources/templates/febs/views/modules/member/agentInfo.html               |   30 +++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/AgentFriendRelationEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/AgentFriendRelationEntity.java
index 8f23f9c..30c3989 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/AgentFriendRelationEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/AgentFriendRelationEntity.java
@@ -72,6 +72,8 @@
      */
     @TableField(exist = false)
     private int promotionNumber;
+	@TableField(exist = false)
+	private int accountType;
     /**
      * 总充值
      */
diff --git a/src/main/resources/templates/febs/views/modules/documentary/traderProfit.html b/src/main/resources/templates/febs/views/modules/documentary/traderProfit.html
index b37e91e..b6bb209 100644
--- a/src/main/resources/templates/febs/views/modules/documentary/traderProfit.html
+++ b/src/main/resources/templates/febs/views/modules/documentary/traderProfit.html
@@ -76,13 +76,13 @@
             }
 
             if (layEvent === 'seeFollowerInfo') {
+                $query.click();
                 febs.modal.open('跟随者详情', 'modules/documentary/seeFollowerInfo/' + data.id, {
                     area: $(window).width() <= 750 ? '90%' : '80%',
                     offset: '30px',
                     btn: ['取消'],
                     btn2: function () {
                         layer.closeAll();
-                        $query.click();
                     }
                 });
                 $query.click();
diff --git a/src/main/resources/templates/febs/views/modules/member/agentInfo.html b/src/main/resources/templates/febs/views/modules/member/agentInfo.html
index 6bf66ef..c96d35d 100644
--- a/src/main/resources/templates/febs/views/modules/member/agentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/agentInfo.html
@@ -73,13 +73,13 @@
                 totalRow: true,
                 cols: [[
                 	{field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
-                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
-                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
-                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
-                    {field: 'promotionNumber', title: '推广人数', minWidth: 200,align:'center'},
-                    {field: 'totalRecharge', title: '总充值', minWidth: 200,align:'center'},
-                    {field: 'totalWithdrawal', title: '总提现', minWidth: 200,align:'center'},
-                    {field: 'totalPerformance', title: '总业绩', minWidth: 200,align:'center'},
+                    {field: 'email', title: '邮箱', minWidth: 120,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
+                    {field: 'promotionNumber', title: '推广人数', minWidth: 120,align:'center'},
+                    {field: 'totalRecharge', title: '总充值', minWidth: 120,align:'center'},
+                    {field: 'totalWithdrawal', title: '总提现', minWidth: 120,align:'center'},
+                    {field: 'totalPerformance', title: '总业绩', minWidth: 120,align:'center'},
                     {field: 'team', title: '团队',
                     	templet: function (d) {
                     		if(d.team != null ){
@@ -87,13 +87,13 @@
                     		}else{
                     			return ''
                     		}
-                        }, minWidth: 200,align:'center',sort: true},
+                        }, minWidth: 120,align:'center',sort: true},
                         
                         {field: 'levelId', title: '代理',
                         	templet: function (d) {
                                  	return '<span style="color:green;">'+d.levelId+'</span>'
-                            }, minWidth: 200,align:'center'},
-                        {field: 'returnRatio', title: '返佣比例', minWidth: 200,align:'center'},
+                            }, minWidth: 120,align:'center'},
+                        {field: 'returnRatio', title: '返佣比例', minWidth: 120,align:'center'},
                     {field: 'feeIsSelf', title: '手续费是否设置自己',
                     	templet: function (d) {
                     		if(d.feeIsSelf === 1){
@@ -101,7 +101,15 @@
                     		}else{
                               	return '<span style="color:red;">否</span>'
                     		}
-                        }, minWidth: 200,align:'center'},
+                        }, minWidth: 120,align:'center'},
+                    {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'},
                 ]]
             });
         }

--
Gitblit v1.9.1