From fe272052df200f15838ddf1ad362e4e2ba9f1ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 13 Apr 2021 11:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/total/Portal.php  |  1 +
 app/data/view/total/portal/index.html | 42 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/app/data/controller/total/Portal.php b/app/data/controller/total/Portal.php
index 86cc0b569..d5ec79593 100644
--- a/app/data/controller/total/Portal.php
+++ b/app/data/controller/total/Portal.php
@@ -33,6 +33,7 @@ class Portal extends Controller
                     '订单数量' => $this->app->db->name('ShopOrder')->whereLike('create_at', "{$date}%")->whereRaw('status>=4')->count(),
                     '订单金额' => $this->app->db->name('ShopOrder')->whereLike('create_at', "{$date}%")->whereRaw('status>=4')->sum('amount_total'),
                     '返利金额' => $this->app->db->name('DataUserRebate')->whereLike('create_at', "{$date}%")->sum('amount'),
+                    '剩余余额' => $this->app->db->name('DataUserBalance')->whereRaw("create_at<='{$date} 23:59:59' and deleted=0")->sum('amount'),
                     '充值余额' => $this->app->db->name('DataUserBalance')->whereLike('create_at', "{$date}%")->whereRaw('amount>0 and deleted=0')->sum('amount'),
                     '消费余额' => $this->app->db->name('DataUserBalance')->whereLike('create_at', "{$date}%")->whereRaw('amount<0 and deleted=0')->sum('amount'),
                 ];
diff --git a/app/data/view/total/portal/index.html b/app/data/view/total/portal/index.html
index 82db27bb0..cbb39f940 100644
--- a/app/data/view/total/portal/index.html
+++ b/app/data/view/total/portal/index.html
@@ -70,6 +70,11 @@
             <div id="main7" style="width:100%;height:350px"></div>
         </div>
     </div>
+    <div class="layui-col-xs12">
+        <div class="think-box-shadow">
+            <div id="main8" style="width:100%;height:350px"></div>
+        </div>
+    </div>
 </div>
 
 <label class="layui-hide">
@@ -132,6 +137,7 @@
                 grid: [{left: '10%', right: '3%', top: '25%'}],
                 series: [
                     {
+                        smooth: true,
                         type: 'line', showSymbol: true, xAxisIndex: 0, yAxisIndex: 0,
                         label: {normal: {position: 'top', formatter: '{c} 元', show: true}},
                         data: data1.map(function (item) {
@@ -160,6 +166,7 @@
                 grid: [{left: '10%', right: '3%', top: '25%'}],
                 series: [
                     {
+                        smooth: true,
                         type: 'line', showSymbol: true, xAxisIndex: 0, yAxisIndex: 0,
                         label: {normal: {position: 'top', formatter: '{c} 人', show: true}},
                         data: data1.map(function (item) {
@@ -188,6 +195,7 @@
                 grid: [{left: '10%', right: '3%', top: '25%'}],
                 series: [
                     {
+                        smooth: true,
                         type: 'line', showSymbol: true, xAxisIndex: 0, yAxisIndex: 0,
                         label: {normal: {position: 'top', formatter: '{c} 单', show: true}},
                         data: data1.map(function (item) {
@@ -212,6 +220,7 @@
                 yAxis: [{type: 'value', splitLine: {show: true}, gridIndex: 0, axisLabel: {formatter: '{value} 元'}}],
                 series: [
                     {
+                        smooth: true,
                         type: 'line', showSymbol: true, xAxisIndex: 0, yAxisIndex: 0,
                         label: {position: 'top', formatter: '{c} 元', show: true},
                         data: data1.map(function (item) {
@@ -236,6 +245,7 @@
                     {
                         name: '充值余额',
                         type: 'line',
+                        smooth: true,
                         label: {position: 'top', formatter: '{c} 元', show: true},
                         data: data1.map(function (item) {
                             return item['充值余额'];
@@ -244,6 +254,7 @@
                     {
                         name: '消费余额',
                         type: 'line',
+                        smooth: true,
                         label: {formatter: '{c} 元', show: true},
                         data: data1.map(function (item) {
                             return item['消费余额'];
@@ -252,6 +263,37 @@
                 ]
             });
         })(echarts.init(document.getElementById('main7')));
+
+        (function (charts) {
+            window.addEventListener("resize", function () {
+                charts.resize()
+            });
+            charts.setOption({
+                grid: [{left: '10%', right: '3%', top: '25%'}],
+                title: [{left: 'center', text: '近十天平台余额趋势'}],
+                tooltip: {trigger: 'axis'},
+                xAxis: [{data: days, gridIndex: 0}],
+                yAxis: [{type: 'value', splitLine: {show: true}, gridIndex: 0, axisLabel: {formatter: '{value} 元'}}],
+                series: [
+                    {
+                        type: 'line',
+                        smooth: true,
+                        showBackground: true,
+                        areaStyle: {color: 'rgba(180, 180, 180, 0.5)'},
+                        label: {formatter: '{c} 元', showSymbol: false, show: true},
+                        data: data1.map(function (item) {
+                            return item['剩余余额'];
+                        }),
+                        markLine: {
+                            data: [[
+                                {x: '90%', symbol: 'none', yAxis: 'max'},
+                                {symbol: 'circle', label: {position: 'start', formatter: '最大 {c} 元'}, type: 'max', name: '最高点'}
+                            ]]
+                        }
+                    }
+                ]
+            });
+        })(echarts.init(document.getElementById('main8')));
     });
 </script>