From 3156be749dfc93764850b27f7cc2b4514a3ae4d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Oct 2023 16:36:54 +0800
Subject: [PATCH] 用户收益列表

---
 src/main/resources/templates/febs/views/index.html |  134 ++++++++++----------------------------------
 1 files changed, 31 insertions(+), 103 deletions(-)

diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index 954d229..04062ff 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -69,9 +69,9 @@
     #febs-index .project-desc {
         color: rgba(0, 0, 0, 0.45);
     }
-    .layui-card:last-child{
-        background: #F8F8F8;
-    }
+    /*.layui-card:last-child{*/
+    /*    background: #F8F8F8;*/
+    /*}*/
     .box{
         background: #FFFFFF;
         padding: 30px 30px;
@@ -107,7 +107,7 @@
 <div class="layui-fluid layui-anim febs-anim-up" id="febs-index" lay-title="系统首页">
     <div class="layui-row layui-col-space8 febs-container">
         <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
-            <div class="layui-card">
+            <div class="layui-card" style="background: #F8F8F8;">
                 <div class="layui-card-body layui-anim layui-anim-fadein">
                     <div class="layui-row welcome-info">
                         <div class="layui-col-md6 layui-col-sm12 layui-col-xs12">
@@ -135,37 +135,37 @@
 
                 <div class="layui-card-body layui-anim layui-anim-fadein">
                     <div class="layui-row">
-                        <div class="m-title">订单付款</div>
+                        <div class="m-title">系统总览</div>
                         <div class="layui-row layui-col-space15">
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">微信支付</p>
-                                        <p class="num"><span id="wechatPay"></span></p>
+                                        <p class="name">账户总余额</p>
+                                        <p class="num"><span id="totalAmount"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">支付宝支付</p>
-                                        <p class="num" ><span id="alipayPay"></span></p>
+                                        <p class="name">账户总拨付</p>
+                                        <p class="num"><span id="totalSystemPay"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">银行卡支付</p>
-                                        <p class="num"><span id="scorePay"></span></p>
+                                        <p class="name">总注册人数</p>
+                                        <p class="num"><span id="totalUser"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">余额支付</p>
-                                        <p class="num"><span id="balancePay"></span></p>
+                                        <p class="name">总收益(扣除等级收益之后)</p>
+                                        <p class="num"><span id="totalIncome"></span></p>
                                     </div>
                                 </div>
                             </div>
@@ -175,100 +175,35 @@
 
                 <div class="layui-card-body layui-anim layui-anim-fadein">
                     <div class="layui-row">
-                        <div class="m-title">业绩</div>
+                        <div class="m-title">今日数据</div>
                         <div class="layui-row layui-col-space15">
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">今日业绩</p>
-                                        <p class="num"><span id="today"></span></p>
+                                        <p class="name">今日注册</p>
+                                        <p class="num"><span id="todayUser"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">昨日业绩</p>
-                                        <p class="num" ><span id="lastDay"></span></p>
+                                        <p class="name">今日拨付</p>
+                                        <p class="num"><span id="todaySystemPay"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">本月业绩</p>
-                                        <p class="num"><span id="thisMonth"></span></p>
+                                        <p class="name">今日收益(扣除等级收益之后)</p>
+                                        <p class="num"><span id="todayIncome"></span></p>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-col-md3">
                                 <div class="layui-panel">
                                     <div class="box">
-                                        <p class="name">上月业绩</p>
-                                        <p class="num"><span id="lastMonth"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="layui-card-body layui-anim layui-anim-fadein">
-                    <div class="layui-row">
-                        <div class="m-title">会员注册</div>
-                        <div class="layui-row layui-col-space15">
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">用户注册总数</p>
-                                        <p class="num"><span id="totalMember"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">正式会员用户总数</p>
-                                        <p class="num" ><span id="formalMember"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">非会员用户总数</p>
-                                        <p class="num"><span id="informalMember"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="layui-card-body layui-anim layui-anim-fadein">
-                    <div class="layui-row">
-                        <div class="layui-row layui-col-space15">
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">本日注册会员数</p>
-                                        <p class="num"><span id="todayMember"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">本月注册会员数</p>
-                                        <p class="num"><span id="thisMonthMember"></span></p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layui-col-md3">
-                                <div class="layui-panel">
-                                    <div class="box">
-                                        <p class="name">上月注册会员数</p>
-                                        <p class="num"><span id="lastMonthMember"></span></p>
                                     </div>
                                 </div>
                             </div>
@@ -307,27 +242,20 @@
             ];
             var index = Math.floor((Math.random() * welcomeArr.length));
             var welcomeMessage = time + ',<a id="febs-index-user">' + currentUser.username + '</a>,' + welcomeArr[index];
-            $view.find('#today').text(data.today).end()
-                .find('#lastDay').text(data.lastDay).end()
-                .find('#thisMonth').text(data.thisMonth).end()
-                .find('#lastMonth').text(data.lastMonth).end()
-                //会员信息
-                .find('#totalMember').text(data.totalMember).end()
-                .find('#formalMember').text(data.formalMember).end()
-                .find('#informalMember').text(data.informalMember).end()
-                .find('#todayMember').text(data.todayMember).end()
-                .find('#thisMonthMember').text(data.thisMonthMember).end()
-                .find('#lastMonthMember').text(data.lastMonthMember).end()
-
-                .find('#wechatPay').text(data.wechatPay).end()
-                .find('#alipayPay').text(data.alipayPay).end()
-                .find('#scorePay').text(data.scorePay).end()
-                .find('#balancePay').text(data.balancePay).end()
-
-                .find('#user-dept').text(currentUser.deptName ? currentUser.deptName : '暂无所属部门').end()
+            $view.find('#user-dept').text(currentUser.deptName ? currentUser.deptName : '暂无所属部门').end()
                 .find('#user-role').text(currentUser.roleName ? currentUser.roleName : '暂无角色').end()
                 .find('#last-login-time').text(currentUser.lastLoginTime ? currentUser.lastLoginTime : '第一次访问系统').end()
                 .find('#welcome-message').html(welcomeMessage).end()
+
+                .find('#totalAmount').text(data.totalAmount).end()
+                .find('#totalSystemPay').text(data.totalSystemPay).end()
+                .find('#totalUser').text(data.totalUser).end()
+                .find('#totalIncome').text(data.totalIncome).end()
+
+                .find('#todaySystemPay').text(data.todaySystemPay).end()
+                .find('#todayIncome').text(data.todayIncome).end()
+                .find('#todayUser').text(data.todayUser).end()
+
                 .find('#user-avatar').attr('src', ctx + "febs/images/avatar/" + currentUser.avatar);
 
             var currentTime = new Date().getTime();

--
Gitblit v1.9.1