From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/resources/templates/febs/views/index.html | 230 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 121 insertions(+), 109 deletions(-)
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index 79778cd..f9eff01 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -3,6 +3,7 @@
border: 1px solid #f1f1f1;
margin-bottom: .5rem;
padding: .5rem;
+ background: #FFFFFF;
}
#febs-index .welcome-info-wrapper {
@@ -68,11 +69,45 @@
#febs-index .project-desc {
color: rgba(0, 0, 0, 0.45);
}
+ /*.layui-card:last-child{*/
+ /* background: #F8F8F8;*/
+ /*}*/
+ .box{
+ background: #FFFFFF;
+ padding: 30px 30px;
+ border-radius: 4px;
+ }
+ .box .name{
+ font-size: 14px;
+ color: #333333;
+ }
+ .box .num{
+ font-size: 24px;
+ color: #1890ff;
+ font-weight: bold;
+ margin-top: 10px;
+ }
+ .m-title{
+ position: relative;
+ font-size: 16px;
+ font-weight: bold;
+ color: #000000;
+ padding-left: 20px;
+ margin: 0 0 10px;
+ }
+ .m-title::before{
+ content: '';
+ position: absolute;
+ left: 0;
+ width: 4px;
+ height: 20px;
+ background: #1890ff;
+ }
</style>
<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">
@@ -95,47 +130,89 @@
</div>
</div>
</div>
- <div class="layui-col-md6 layui-col-sm12 layui-col-xs12">
- <div class="layui-col-md-offset5">
- <table class="login-count-table">
- <tr>
- <td>今日IP</td>
- <td>今日访问</td>
- <td>总访问量</td>
- </tr>
- <tr>
- <td class="count" id="today-ip">
- 0
- </td>
- <td class="count" id="today-visit-count">
- 0
- </td>
- <td class="count" id="total-visit-count">
- 0
- </td>
- </tr>
- </table>
+ </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" id = "memberLevelCounts">
+ </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="todayMember"></span></p>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
- </div>
- </div>
- <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
- <div class="layui-card">
- <div class="layui-card-body">
- <div id="chart" style="height: 350px"></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="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>
+ </div>
+ </div>
</div>
+
</div>
</div>
</div>
</div>
+<script type="text/html" id="memberLevelCount">
+ {{# layui.each(d, function(index, item){ }}
+ <div class="layui-col-md3">
+ <div class="layui-panel">
+ <div class="box">
+ <p class="name">{{item.vipName}}</p>
+ <p class="num">{{item.memberCnt}}</p>
+ </div>
+ </div>
+ </div>
+ {{# }) }}
+</script>
<script data-th-inline="javascript" type="text/javascript">
- layui.use(['apexcharts', 'febs', 'jquery', 'util'], function () {
+ layui.use(['apexcharts', 'febs', 'jquery', 'util', 'laytpl'], function () {
var $ = layui.jquery,
util = layui.util,
$view = $('#febs-index'),
- febs = layui.febs;
+ memberLevelCountHtml = memberLevelCount.innerHTML,
+ $memberLevelCounts = $("#memberLevelCounts"),
+ laytpl = layui.laytpl,
+ febs = layui.febs;
febs.get(ctx + 'index/' + currentUser.username, null, function (r) {
handleSuccess(r.data);
@@ -157,9 +234,21 @@
];
var index = Math.floor((Math.random() * welcomeArr.length));
var welcomeMessage = time + '，<a id="febs-index-user">' + currentUser.username + '</a>，' + welcomeArr[index];
- $view.find('#today-ip').text(data.todayIp).end()
- .find('#today-visit-count').text(data.todayVisitCount).end()
- .find('#total-visit-count').text(data.totalVisitCount).end()
+
+
+ laytpl(memberLevelCountHtml).render(data.vipIndexVos, function(html) {
+ $memberLevelCounts.append(html);
+ })
+ $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('#todayMember').text(data.todayMember).end()
+ .find('#thisMonthMember').text(data.thisMonthMember).end()
+ .find('#lastMonthMember').text(data.lastMonthMember).end()
+
.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()
@@ -201,83 +290,6 @@
});
if (!contain) totalVisitCount.push(0);
});
-
- var options = {
- chart: {
- height: 350,
- type: 'area',
- toolbar: {
- show: false
- }
- },
- colors: ['#1890ff', '#0acf97'],
- plotOptions: {
- bar: {
- horizontal: false,
- columnWidth: '32rem'
- }
- },
- dataLabels: {
- enabled: false
- },
- stroke: {
- width: [3, 3],
- curve: 'smooth'
- },
- series: [{
- name: '总数',
- data: totalVisitCount
- }, {
- name: '您',
- data: yourVisitCount
- }],
- xaxis: {
- categories: lastTenDays,
- axisTicks: {
- show: true
- },
- axisBorder: {
- show: true,
- color: '#f1f1f1'
- }
- },
- fill: {
- type: 'gradient',
- gradient: {
- shadeIntensity: 1,
- inverseColors: false,
- opacityFrom: 0.5,
- opacityTo: 0,
- stops: [0, 90, 100]
- }
- },
- title: {
- text: '近10天系统访问记录',
- align: 'left',
- style: {
- color: 'rgba(0, 0, 0, .65)'
- }
- },
- tooltip: {
- y: {
- formatter: function (val) {
- return "访问次数 " + val + " 次"
- }
- }
- },
- grid: {
- row: {
- colors: ['transparent', 'transparent'],
- opacity: 0.2
- },
- borderColor: '#f1f1f1'
- }
- };
-
- new ApexCharts(
- document.querySelector("#chart"),
- options
- ).render();
}
$view.on('click', '#febs-index-user',function () {
--
Gitblit v1.9.1