From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
index f0c8180..8d31370 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
@@ -62,7 +62,18 @@
</div>
</div>
</div>
- <div class="layui-col-sm3 layui-col-md3">
+ <div class="layui-col-sm2 layui-col-md2">
+ <div class="layui-card">
+ <div class="layui-card-header">快到期套餐
+ </div>
+ <div class="layui-card-body layuiadmin-card-list">
+ <a href="/#!productEnd">
+ <p class="big-font" id="t_product_end"></p>
+ </a>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-sm3 layui-col-md2">
<div class="layui-card">
<div class="layui-card-header">用户反馈
</div>
@@ -73,7 +84,7 @@
</div>
</div>
</div>
- <div class="layui-col-sm3 layui-col-md3">
+ <div class="layui-col-sm3 layui-col-md2">
<div class="layui-card">
<div class="layui-card-header">数据需求
</div>
@@ -237,6 +248,17 @@
return null;
}
}, "get");
+ }
+ // 加载套餐到期统计数据
+ var loadProEndCountChart = function () {
+ admin.req("api-opration/productorderdetail/productEnd", {page: 1,limit: 9999,monthPar: 1
+,aiCountPar: 50}, function (data) {
+ if (0 === data.code) {
+ counts= data.count;
+ } else {
+ return null;
+ }
+ }, "get");
}
//加载套餐使用图表
var loadContractChart = function () {
@@ -475,6 +497,9 @@
//待审核试用套餐
loadOprationChart(0);
$("#t_product").html(counts);
+ //套餐到期
+ loadProEndCountChart();
+ $("#t_product_end").html(counts);
//用户反馈
loadOprationChart(2);
$("#u_feedback").html(counts);
--
Gitblit v1.8.0