统计

application/admin/controller/Dashboard.php

@@ -57,16 +57,18 @@ class Dashboard extends Backend
             $starttime = Date::unixtime('day', -6);
             $endtime = Date::unixtime('day', 0, 'end');
         //$joinlist = Db("p_order")->where('jointime', 'between time', [$starttime, $endtime])->field('jointime, status, COUNT(*) AS nums, DATE_FORMAT(FROM_UNIXTIME(jointime), "%Y-%m-%d") AS join_date')
-            $joinlist = Db("p_order")->where($where)->field('createtime, status, SUM(num) AS nums, DATE_FORMAT(FROM_UNIXTIME(createtime), "%Y-%m-%d") AS join_date')
+            $joinlist = Db("p_order")->where($where)->field('createtime, status,COUNT(*) AS nums, SUM(num) AS sum, DATE_FORMAT(FROM_UNIXTIME(createtime), "%Y-%m-%d") AS join_date')
             ->group('join_date')
             ->select();
             for ($time = $starttime; $time <= $endtime;) {
                 $column[] = date("Y-m-d", $time);
                 $time += 86400;
             }
-            $userlist = array_fill_keys($column, 0);
+            $codelist = array_fill_keys($column, 0);//sum
+            $orderlist = array_fill_keys($column, 0);//count
             foreach ($joinlist as $k => $v) {
-                $userlist[$v['join_date']] = $v['nums'];
+                $codelist[$v['join_date']] = $v['sum'];
+                $orderlist[$v['join_date']] = $v['nums'];
             }
 
             $dbTableList = Db::query("SHOW TABLE STATUS");
@@ -94,14 +96,16 @@ class Dashboard extends Backend
             ];
 
             $orders = [];
-            $orders['userlist'] = $userlist;
+            $orders['codelist'] = $codelist;
+            $orders['orderlist'] = $orderlist;
             $orders['datalist'] = $datalist;
             Cache::set($key, $orders, 300);
         }
 
         $this->view->assign($orders['datalist']);
-        $this->assignconfig('column', array_keys($orders['userlist']));
-        $this->assignconfig('userdata', array_values($orders['userlist']));
+        $this->assignconfig('column', array_keys($orders['codelist']));
+        $this->assignconfig('codelistdata', array_values($orders['codelist']));
+        $this->assignconfig('orderlistdata', array_values($orders['orderlist']));
 
         $this->assign('isadmin', $this->auth->id == 1);
 

application/extra/site.php

@@ -4,23 +4,23 @@ return array (
   'name' => '生猪屠宰溯源平台',
   'beian' => '',
   'cdnurl' => '',
-  'version' => '1.0.1',
+  'version' => '1.0.2',
   'timezone' => 'Asia/Shanghai',
   'forbiddenip' => '',
-  'languages' =>
+  'languages' => 
   array (
     'backend' => 'zh-cn',
     'frontend' => 'zh-cn',
   ),
   'fixedpage' => 'dashboard',
-  'categorytype' =>
+  'categorytype' => 
   array (
     'default' => 'Default',
     'page' => 'Page',
     'article' => 'Article',
     'test' => 'Test',
   ),
-  'configgroup' =>
+  'configgroup' => 
   array (
     'basic' => 'Basic',
     'email' => 'Email',
@@ -28,12 +28,6 @@ return array (
     'user' => 'User',
     'example' => 'Example',
   ),
-  'attachmentcategory' =>
-  array (
-    'category1' => 'Category1',
-    'category2' => 'Category2',
-    'custom' => 'Custom',
-  ),
   'mail_type' => '1',
   'mail_smtp_host' => 'smtp.qq.com',
   'mail_smtp_port' => '465',
@@ -41,4 +35,10 @@ return array (
   'mail_smtp_pass' => 'password',
   'mail_verify_type' => '2',
   'mail_from' => '10000@qq.com',
+  'attachmentcategory' => 
+  array (
+    'category1' => 'Category1',
+    'category2' => 'Category2',
+    'custom' => 'Custom',
+  ),
 );

public/assets/js/backend/dashboard.js

@@ -23,7 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                     trigger: 'axis'
                 },
                 legend: {
-                    data: [__('Register user')]
+                    data: ['溯源码','订单']
                 },
                 toolbox: {
                     show: false,
@@ -45,7 +45,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                     bottom: 30
                 }],
                 series: [{
-                    name: __('Register user'),
+                    name: '溯源码',
                     type: 'line',
                     smooth: true,
                     areaStyle: {
@@ -56,7 +56,21 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                             width: 1.5
                         }
                     },
-                    data: Config.userdata
+                    data: Config.codelistdata
+                },
+                {
+                    name: '订单',
+                    type: 'line',
+                    smooth: true,
+                    areaStyle: {
+                        normal: {}
+                    },
+                    lineStyle: {
+                        normal: {
+                            width: 1.5
+                        }
+                    },
+                    data: Config.orderlistdata
                 }]
             };