Merge branch 'qs_local_cs' into develop

5 years ago · b8535c90b1
5 changed files with 7 additions and 43 deletions
--- a/app/Admin/Controllers/HomeController.php
+++ b/app/Admin/Controllers/HomeController.php
@ -2,7 +2,6 @@

 namespace App\Admin\Controllers;

-use App\admin\Card\Community;
 use App\admin\Card\TotalUser;
 use App\Admin\Metrics\Examples;
 use App\Http\Controllers\Controller;
@ -89,11 +88,11 @@ class HomeController extends Controller
            ->description('欢迎回到懒族后台')
            ->body(function (Row $row) {
                $row->column(4, function (Column $column) {
-                    $column->row(new Examples\TotalCommunity());
+                    $column->row(new Examples\Community\TotalCommunity());
                });

                $row->column(4, function (Column $column) {
-                    $column->row(new TotalUser());
+                    $column->row(new Examples\Community\TotalUser());
                });
            });
    }
@ -104,11 +103,11 @@ class HomeController extends Controller
            ->description('欢迎回到懒族后台')
            ->body(function (Row $row) {
                $row->column(4, function (Column $column) {
-                    $column->row(new TotalUser());
+                    $column->row(new Examples\Community\TotalUser());
                });

                $row->column(4, function (Column $column) {
-                    $column->row(new Community\TotalAmount());
+                    $column->row(new Examples\Community\TotalAmount());
                });
            });
    }
--- a/app/Admin/Metrics/Examples/Community/TotalAmount.php
+++ b/app/Admin/Metrics/Examples/Community/TotalAmount.php
@ -1,6 +1,6 @@
 <?php
-namespace App\admin\Card\Community;

+namespace App\Admin\Metrics\Examples\Community;

 use App\Models\LanzuUserBalance;
 use Dcat\Admin\Admin;
--- a/app/Admin/Metrics/Examples/Community/TotalCommunity.php
+++ b/app/Admin/Metrics/Examples/Community/TotalCommunity.php
@ -1,9 +1,8 @@
 <?php


-namespace App\admin\Card\Community;
-

+namespace App\Admin\Metrics\Examples\Community;

 use App\Models\LanzuCsInfo;
 use Dcat\Admin\Widgets\Metrics\Card;
--- a/app/Admin/Metrics/Examples/Community/TotalUser.php
+++ b/app/Admin/Metrics/Examples/Community/TotalUser.php
@ -1,7 +1,7 @@
 <?php


-namespace App\admin\Card;
+namespace App\Admin\Metrics\Examples\Community;


 use App\Models\LanzuUserRelationBind;
--- a/app/Admin/Metrics/Examples/TotalCommunity.php
+++ b/app/Admin/Metrics/Examples/TotalCommunity.php
@ -1,34 +0,0 @@
-<?php
-
-
-namespace App\Admin\Metrics\Examples;
-
-
-
-use App\Models\LanzuCsInfo;
-use Dcat\Admin\Widgets\Metrics\Card;
-
-class TotalCommunity extends Card
-{
-    protected function init()
-    {
-        parent::init();
-        $this->title = '社区总数';
-        $this->content(LanzuCsInfo::count());
-    }
-
-    /**
-     * 渲染卡片内容.
-     *
-     * @return string
-     */
-    public function renderContent()
-    {
-        $content = parent::renderContent();
-        return <<<HTML
-<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
-    <h2 class="ml-1 font-large-1">{$content}</h2>
-</div>
-HTML;
-    }
-}