lizhen hace 2 días
padre
commit
9e83396200

+ 11 - 21
application/admin/controller/Dashboard.php

@@ -44,35 +44,25 @@ class Dashboard extends Backend
             $userlist[$v['join_date']] = $v['nums'];
             $userlist[$v['join_date']] = $v['nums'];
         }
         }
 
 
-        $dbTableList = Db::query("SHOW TABLE STATUS");
-        $addonList = get_addon_list();
-        $totalworkingaddon = 0;
-        $totaladdon = count($addonList);
-        foreach ($addonList as $index => $item) {
-            if ($item['state']) {
-                $totalworkingaddon += 1;
-            }
-        }
+
         $this->view->assign([
         $this->view->assign([
             'totaluser'         => User::count(),
             'totaluser'         => User::count(),
-            'totaladdon'        => $totaladdon,
-            'totaladmin'        => Admin::count(),
-            'totalcategory'     => 1,
+            'totalorder'        => Db::name('unishop_order')->where('status',1)->where('have_paid','gt',0)->count(),
+            'kongjianyuyue'     => Db::name('kongjianyuyue')->count(),
+            'laorenguanhuai'    => Db::name('laorenguanhuai')->count(),
+            'service_grade'     => Db::name('service_grade')->count(),
+            'topic_dongtai'     => Db::name('topic_dongtai')->where('auditstatus',1)->count(),
+            'exam_grade'        => Db::name('exam_grade')->where('status',2)->count(),
+
             'todayusersignup'   => User::whereTime('jointime', 'today')->count(),
             'todayusersignup'   => User::whereTime('jointime', 'today')->count(),
             'todayuserlogin'    => User::whereTime('logintime', 'today')->count(),
             'todayuserlogin'    => User::whereTime('logintime', 'today')->count(),
             'sevendau'          => User::whereTime('jointime|logintime|prevtime', '-7 days')->count(),
             'sevendau'          => User::whereTime('jointime|logintime|prevtime', '-7 days')->count(),
             'thirtydau'         => User::whereTime('jointime|logintime|prevtime', '-30 days')->count(),
             'thirtydau'         => User::whereTime('jointime|logintime|prevtime', '-30 days')->count(),
             'threednu'          => User::whereTime('jointime', '-3 days')->count(),
             'threednu'          => User::whereTime('jointime', '-3 days')->count(),
             'sevendnu'          => User::whereTime('jointime', '-7 days')->count(),
             'sevendnu'          => User::whereTime('jointime', '-7 days')->count(),
-            'dbtablenums'       => count($dbTableList),
-            'dbsize'            => array_sum(array_map(function ($item) {
-                return $item['Data_length'] + $item['Index_length'];
-            }, $dbTableList)),
-            'totalworkingaddon' => $totalworkingaddon,
-            'attachmentnums'    => Attachment::count(),
-            'attachmentsize'    => Attachment::sum('filesize'),
-            'picturenums'       => Attachment::where('mimetype', 'like', 'image/%')->count(),
-            'picturesize'       => Attachment::where('mimetype', 'like', 'image/%')->sum('filesize'),
+
+
+
         ]);
         ]);
 
 
         $this->assignconfig('column', array_keys($userlist));
         $this->assignconfig('column', array_keys($userlist));

+ 5 - 2
application/admin/controller/unishop/Order.php

@@ -54,12 +54,12 @@ class Order extends Backend
 
 
             //核销组只能看已核销的,且核销人是自己的
             //核销组只能看已核销的,且核销人是自己的
             $where_user = [];
             $where_user = [];
-            if($this->auth->getGroupIds()[0] == 8){
+            /*if($this->auth->getGroupIds()[0] == 8){
                 $where_user = [
                 $where_user = [
                     'order.have_received' => ['neq',0],
                     'order.have_received' => ['neq',0],
                     'order.hexiao_uid'    => ['=',$this->auth->user_id],
                     'order.hexiao_uid'    => ['=',$this->auth->user_id],
                 ];
                 ];
-            }
+            }*/
 
 
 
 
             $total = $this->model
             $total = $this->model
@@ -70,6 +70,7 @@ class Order extends Backend
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
                 ->where($where)
                 ->where($where_user)
                 ->where($where_user)
+                ->where('order.have_paid','gt',0)
                 ->count();
                 ->count();
 
 
             $sum_price = $this->model
             $sum_price = $this->model
@@ -80,6 +81,7 @@ class Order extends Backend
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
                 ->where($where)
                 ->where($where_user)
                 ->where($where_user)
+                ->where('order.have_paid','gt',0)
                 ->sum('total_price');
                 ->sum('total_price');
 
 
             $list = $this->model
             $list = $this->model
@@ -90,6 +92,7 @@ class Order extends Backend
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->join('unishop_order_product op', 'op.order_id = order.id','LEFT')
                 ->where($where)
                 ->where($where)
                 ->where($where_user)
                 ->where($where_user)
+                ->where('order.have_paid','gt',0)
                 ->order($sort, $order)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
                 ->limit($offset, $limit)
                 ->field('order.*,user.nickname,intro.nickname as intro_nickname,intro.mobile as intro_mobile,hexiao.nickname as hexiao_nickname,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')
                 ->field('order.*,user.nickname,intro.nickname as intro_nickname,intro.mobile as intro_mobile,hexiao.nickname as hexiao_nickname,hexiao.mobile as hexiao_mobile,op.product_id as op_product_id,op.title as op_title,op.number as op_number,op.spec as op_spec,op.price as op_price')

+ 39 - 123
application/admin/view/dashboard/index.html

@@ -160,13 +160,7 @@
     }
     }
 </style>
 </style>
 <div class="panel panel-default panel-intro">
 <div class="panel panel-default panel-intro">
-    <div class="panel-heading">
-        {:build_heading(null, false)}
-        <ul class="nav nav-tabs">
-            <li class="active"><a href="#one" data-toggle="tab">{:__('Dashboard')}</a></li>
-            <li><a href="#two" data-toggle="tab">{:__('Custom')}</a></li>
-        </ul>
-    </div>
+
     <div class="panel-body">
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
             <div class="tab-pane fade active in" id="one">
@@ -177,34 +171,61 @@
                             <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>
                             <span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>
                             <div class="sm-st-info">
                             <div class="sm-st-info">
                                 <span>{$totaluser}</span>
                                 <span>{$totaluser}</span>
-                                {:__('Total user')}
+                                用户总数
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 col-xs-6">
+                        <div class="sm-st clearfix">
+                            <span class="sm-st-icon st-violet"><i class="fa fa-font-awesome"></i></span>
+                            <div class="sm-st-info">
+                                <span>{$totalorder}</span>
+                                活动报名数
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 col-xs-6">
+                        <div class="sm-st clearfix">
+                            <span class="sm-st-icon st-blue"><i class="fa fa-birthday-cake"></i></span>
+                            <div class="sm-st-info">
+                                <span>{$kongjianyuyue}</span>
+                                空间预约
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-3 col-xs-6">
                     <div class="col-sm-3 col-xs-6">
                         <div class="sm-st clearfix">
                         <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-violet"><i class="fa fa-magic"></i></span>
+                            <span class="sm-st-icon st-green"><i class="fa fa-cutlery"></i></span>
                             <div class="sm-st-info">
                             <div class="sm-st-info">
-                                <span>{$totaladdon}</span>
-                                {:__('Total addon')}
+                                <span>{$laorenguanhuai}</span>
+                                老人关怀
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-3 col-xs-6">
                     <div class="col-sm-3 col-xs-6">
                         <div class="sm-st clearfix">
                         <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-blue"><i class="fa fa-leaf"></i></span>
+                            <span class="sm-st-icon st-blue"><i class="fa fa-asl-interpreting"></i></span>
                             <div class="sm-st-info">
                             <div class="sm-st-info">
-                                <span>{$attachmentnums}</span>
-                                {:__('Total attachment')}
+                                <span>{$service_grade}</span>
+                                社区服务
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="col-sm-3 col-xs-6">
                     <div class="col-sm-3 col-xs-6">
                         <div class="sm-st clearfix">
                         <div class="sm-st clearfix">
-                            <span class="sm-st-icon st-green"><i class="fa fa-user"></i></span>
+                            <span class="sm-st-icon st-red"><i class="fa fa-clipboard"></i></span>
                             <div class="sm-st-info">
                             <div class="sm-st-info">
-                                <span>{$totaladmin}</span>
-                                {:__('Total admin')}
+                                <span>{$topic_dongtai}</span>
+                                邻里交流
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 col-xs-6">
+                        <div class="sm-st clearfix">
+                            <span class="sm-st-icon st-violet"><i class="fa fa-columns"></i></span>
+                            <div class="sm-st-info">
+                                <span>{$exam_grade}</span>
+                                科普答题次数
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -272,7 +293,7 @@
                                         <div class="stat-icon"><i class="fa fa-user-circle-o"></i></div>
                                         <div class="stat-icon"><i class="fa fa-user-circle-o"></i></div>
                                         <div class="stat">
                                         <div class="stat">
                                             <div class="value"> {$thirtydau}</div>
                                             <div class="value"> {$thirtydau}</div>
-                                            <div class="name"> {:__('Thirty dau')}</div>
+                                            <div class="name"> 30日活跃</div>
                                         </div>
                                         </div>
                                         <div class="progress">
                                         <div class="progress">
                                             <div class="progress-bar progress-bar-success" style="width: 20%"></div>
                                             <div class="progress-bar progress-bar-success" style="width: 20%"></div>
@@ -284,112 +305,7 @@
                     </div>
                     </div>
                 </div>
                 </div>
 
 
-                <div class="row" style="margin-top:15px;" id="statistics">
-
-                    <div class="col-lg-12">
-                    </div>
-                    <div class="col-xs-6 col-md-3">
-                        <div class="panel bg-blue-gradient no-border">
-                            <div class="panel-body">
-                                <div class="panel-title">
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
-                                    <h5>{:__('Working addon count')}</h5>
-                                </div>
-                                <div class="panel-content">
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <h1 class="no-margins">{$totalworkingaddon}</h1>
-                                            <div class="font-bold"><i class="fa fa-magic"></i>
-                                                <small>{:__('Working addon count tips')}</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-6 col-md-3">
-                        <div class="panel bg-teal-gradient no-border">
-                            <div class="panel-body">
-                                <div class="ibox-title">
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
-                                    <h5>{:__('Database count')}</h5>
-                                </div>
-                                <div class="ibox-content">
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$dbtablenums}</h1>
-                                            <div class="font-bold"><i class="fa fa-database"></i>
-                                                <small>{:__('Database table nums')}</small>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$dbsize|format_bytes=###,'',0}</h1>
-                                            <div class="font-bold"><i class="fa fa-filter"></i>
-                                                <small>{:__('Database size')}</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
 
 
-                    <div class="col-xs-6 col-md-3">
-                        <div class="panel bg-purple-gradient no-border">
-                            <div class="panel-body">
-                                <div class="ibox-title">
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
-                                    <h5>{:__('Attachment count')}</h5>
-                                </div>
-                                <div class="ibox-content">
-
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$attachmentnums}</h1>
-                                            <div class="font-bold"><i class="fa fa-files-o"></i>
-                                                <small>{:__('Attachment nums')}</small>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$attachmentsize|format_bytes=###,'',0}</h1>
-                                            <div class="font-bold"><i class="fa fa-filter"></i>
-                                                <small>{:__('Attachment size')}</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-6 col-md-3">
-                        <div class="panel bg-green-gradient no-border">
-                            <div class="panel-body">
-                                <div class="ibox-title">
-                                    <span class="label label-primary pull-right">{:__('Real time')}</span>
-                                    <h5>{:__('Picture count')}</h5>
-                                </div>
-                                <div class="ibox-content">
-
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$picturenums}</h1>
-                                            <div class="font-bold"><i class="fa fa-picture-o"></i>
-                                                <small>{:__('Picture nums')}</small>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-6">
-                                            <h1 class="no-margins">{$picturesize|format_bytes=###,'',0}</h1>
-                                            <div class="font-bold"><i class="fa fa-filter"></i>
-                                                <small>{:__('Picture size')}</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
             </div>
             <div class="tab-pane fade" id="two">
             <div class="tab-pane fade" id="two">
                 <div class="row">
                 <div class="row">