黄宗昌 пре 2 година
родитељ
комит
cae0ad0599

+ 28 - 0
app/Admin/Controllers/HomeController.php

@@ -17,6 +17,34 @@ class HomeController extends Controller
             ->header(trans('admin-home.Data_panel'))
             ->header(trans('admin-home.Data_panel'))
             ->description('')
             ->description('')
             ->body(function (Row $row) {
             ->body(function (Row $row) {
+                // 用户
+                $row->column(10, function (Column $column) {
+                    $column->row(new Examples\NewUsers());
+                });
+                $row->column(2, function (Column $column) {
+                    $column->row(function (Row $row) {
+                        $row->column(12, new Examples\TotalUsers());
+                    });
+                });
+                // 产品
+                $row->column(10, function (Column $column) {
+                    $column->row(new Examples\NewProduct());
+                });
+                $row->column(2, function (Column $column) {
+                    $column->row(function (Row $row) {
+                        $row->column(12, new Examples\TotalUsers());
+                    });
+                });
+                // 举报
+                $row->column(10, function (Column $column) {
+                    $column->row(new Examples\NewUsers());
+                });
+                $row->column(2, function (Column $column) {
+                    $column->row(function (Row $row) {
+                        $row->column(12, new Examples\TotalUsers());
+                    });
+                });
+                // 消息
                 $row->column(10, function (Column $column) {
                 $row->column(10, function (Column $column) {
                     $column->row(new Examples\NewUsers());
                     $column->row(new Examples\NewUsers());
                 });
                 });

+ 4 - 2
app/Http/Controllers/V1/ProductController.php

@@ -207,8 +207,10 @@ class ProductController extends Controller
         $query = Product::query()
         $query = Product::query()
             ->with('user:id,name,nickname,avatar,company_name,company_card_color,production_project');
             ->with('user:id,name,nickname,avatar,company_name,company_card_color,production_project');
         if(!empty($type)){
         if(!empty($type)){
-            $type =  array_map('intval', explode(',',$type));
-            $query->whereJsonContains('type',$type);
+            $arr = explode(',',$type);
+            foreach ($arr as $v){
+                $query->orWhereJsonContains('type',[intval($v)]);
+            }
         }
         }
         if(!empty($keyword)){
         if(!empty($keyword)){
             $query->where('name','like','%'.$keyword.'%');
             $query->where('name','like','%'.$keyword.'%');

+ 1 - 1
config/admin.php

@@ -22,7 +22,7 @@ return [
     | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
     | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
     |
     |
     */
     */
-    'logo' => '<img src="/vendor/dcat-admin/images/logo.png" width="35"> &nbsp;HuaBook',
+    'logo' => '<img src="/uploads/logo.png" width="35"> &nbsp;HuaBook',
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------

BIN
public/favicon.ico


+ 2 - 0
resources/lang/ko/admin-home.php

@@ -13,4 +13,6 @@ return [
     'Start_time'=>'开始时间',
     'Start_time'=>'开始时间',
 
 
     'whole'   => '모두',
     'whole'   => '모두',
+
+    'New_Product' => '신제품'
 ];
 ];

+ 2 - 1
resources/lang/zh/admin-home.php

@@ -21,5 +21,6 @@ return [
 
 
     'whole'   => '全部',
     'whole'   => '全部',
     'New_Lock' => '新增设备',
     'New_Lock' => '新增设备',
-    'Total_Lock' => '设备总数'
+    'Total_Lock' => '设备总数',
+    'New_Product' => '新产品'
 ];
 ];