调整后台细节

app/Admin/Controllers/ActivityController.php

@@ -34,8 +34,13 @@ class ActivityController extends AdminController
                             ->placeholder(__('admin.id')),
                     amis()->TextControl('name', __('admin.activities.name'))->columnRatio(3)
                             ->placeholder(__('admin.activities.name')),
+                    amis()->SelectControl('state', __('admin.activities.state'))->columnRatio(3)
+                            ->clearAble()
+                            ->options([
+                                1=>'进行中',2=>'已结束',0=>'未发布'
+                            ]),
                 ]),
-            ]))
+            ]))->filterDefaultVisible(true)
             ->itemCheckableOn('${state === 0}')
             ->columns([
                 amis()->TableColumn('id', __('admin.id'))->width('50px')->sortable(),

app/Admin/Controllers/AdController.php

@@ -30,21 +30,21 @@ class AdController extends AdminController
             ])
             ->filter($this->baseFilter()->labelWidth('80px')->body([
                 amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->TextControl('id', __('admin.ads.id'))
+                    amis()->TextControl('id', __('admin.ads.id'))->columnRatio(3)
                             ->placeholder(__('admin.id')),
-                    amis()->TextControl('remark', __('admin.ads.remark'))
+                    // amis()->TextControl('remark', __('admin.ads.remark'))
-                            ->placeholder(__('admin.ads.remark')),
+                    //         ->placeholder(__('admin.ads.remark')),
-                    Components::make()->parentControl(admin_url('api/keywords/tree-list?parent_name=banner_address&has_owner=0'), 'address', __('admin.ads.address'), 'name', 'key'),
+                    Components::make()->parentControl(admin_url('api/keywords/tree-list?parent_name=banner_address&has_owner=0'), 'address', __('admin.ads.address'), 'name', 'key')->columnRatio(3),
-                    amis()->SelectControl('enable', __('admin.ads.is_enable'))
+                    amis()->SelectControl('enable', __('admin.ads.is_enable'))->columnRatio(3)
                             ->options([
                                 1=>'开启',0=>'关闭'
                             ]),
                 ]),
-                amis()->GroupControl()->mode('horizontal')->body([
+                // amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->InputDatetimeRange()->label(__('admin.ads.published_at'))->name('published_at'),
+                //     amis()->InputDatetimeRange()->label(__('admin.ads.published_at'))->name('published_at'),
-                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at'),  
+                //     amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at'),  
-                ]),
+                // ]),
-            ]))
+            ]))->filterDefaultVisible(true)
             ->columns([
                 amis()->TableColumn('id', __('admin.ads.id'))->width('50px')->sortable(),
                 amis()->TableColumn('address', __('admin.ads.address'))->type('mapping')

app/Admin/Controllers/ArticleController.php

@@ -27,11 +27,11 @@ class ArticleController extends AdminController
             ])
             ->filter($this->baseFilter()->body([
                 amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->TextControl('id', __('admin.articles.id'))
+                    amis()->TextControl('id', __('admin.articles.id'))->columnRatio(3)
                             ->placeholder(__('admin.id')),
-                    amis()->TextControl('title', __('admin.articles.title'))
+                    amis()->TextControl('title', __('admin.articles.title'))->columnRatio(3)
                             ->placeholder(__('admin.articles.title')),
-                    Components::make()->parentControl(admin_url('api/keywords/tree-list?parent_name=article_category&has_owner=0'), 'category', __('admin.articles.category'), 'name', 'key'),
+                    Components::make()->parentControl(admin_url('api/keywords/tree-list?parent_name=article_category&has_owner=0'), 'category', __('admin.articles.category'), 'name', 'key')->columnRatio(3),
                     // Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'),
                 ]),
                 amis()->GroupControl()->mode('horizontal')->body([ 
@@ -45,12 +45,12 @@ class ArticleController extends AdminController
                         ->options([
                             1=>'开启',0=>'关闭'
                         ]),
-                    amis()->InputDatetimeRange()->label(__('admin.articles.published_at'))->name('published_at'),        
+                    // amis()->InputDatetimeRange()->label(__('admin.articles.published_at'))->name('published_at'),        
                 ]),
-                amis()->GroupControl()->mode('horizontal')->body([
+                // amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at')->columnRatio(6),      
+                //     amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at')->columnRatio(6),      
-                ]),
+                // ]),
-            ]))
+            ]))->filterDefaultVisible(true)
             ->itemBadge([//行角标
                 'text' => __('admin.articles.is_recommend'),
                 'mode' => 'ribbon',

app/Admin/Controllers/UserController.php

@@ -31,7 +31,7 @@ class UserController extends AdminController
                     amis()->TextControl('phone', __('admin.users.phone'))->columnRatio(3)
                             ->placeholder(__('admin.users.phone')),
                 ]),
-            ]))
+            ]))->filterDefaultVisible(true)
             ->columns([
                 amis()->TableColumn('id', __('admin.id'))->width('50px')->sortable(),
                 amis()->TableColumn('nick_name', __('admin.users.nick_name')),

app/Admin/Controllers/UserGameController.php

@@ -26,16 +26,15 @@ class UserGameController extends AdminController
             ])
             ->filter($this->baseFilter()->labelWidth('80px')->body([
                 amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->SelectControl('activity', __('admin.activities.name'))->options(Activity::sort()->pluck('name', 'id')->toArray())
+                    amis()->SelectControl('activity', __('admin.activities.name'))->columnRatio(3)
-                    ->columnRatio(3),
+                        ->options(Activity::sort()->pluck('name', 'id')->toArray()),
-                    amis()->TextControl('user_name', __('admin.users.nick_name'))
+                    amis()->TextControl('game_name', __('admin.activity_games.name'))->columnRatio(3),
-                    ->columnRatio(3)
+                    amis()->TextControl('user_name', __('admin.users.nick_name'))->columnRatio(3)
-                            ->placeholder(__('admin.users.nick_name')),
+                        ->placeholder(__('admin.users.nick_name')),
-                    amis()->TextControl('user_phone', __('admin.users.phone'))
+                    amis()->TextControl('user_phone', __('admin.users.phone'))->columnRatio(3)
-                    ->columnRatio(3)
+                        ->placeholder(__('admin.users.phone')),
-                            ->placeholder(__('admin.users.phone')),
                 ])
-            ]))
+            ]))->filterDefaultVisible(true)
             ->columns([
                 amis()->TableColumn('activity.name', __('admin.activities.name')),
                 amis()->TableColumn('game.name', __('admin.activity_games.name')),

app/Admin/Controllers/UserGiftController.php

@@ -32,12 +32,12 @@ class UserGiftController extends AdminController
                             ->placeholder(__('admin.users.nick_name')),
                     amis()->TextControl('user_phone', __('admin.users.phone'))
                             ->placeholder(__('admin.users.phone')),
-                    amis()->SelectControl('state', __('admin.user_gifts.state'))
+                    amis()->SelectControl('state', __('admin.user_gifts.state'))->clearAble()
                             ->options([
                                 1=>'未发货',2=>'已发货',0=>'未领取'
                             ]),
                 ])
-            ]))
+            ]))->filterDefaultVisible(true)
             ->columns([
                 amis()->TableColumn('activity.name', __('admin.activities.name')),
                 amis()->TableColumn('gift.name', __('admin.activity_gifts.name')),

app/Models/Filters/ActivityFilter.php

@@ -21,4 +21,9 @@ class ActivityFilter extends ModelFilter
     {
         return $this->where('name','like', $name.'%');
     }
+
+    public function state($state)
+    {
+        return $this->where('state', $state);
+    }
 }

app/Models/Filters/UserGameFilter.php

@@ -9,7 +9,7 @@ class UserGameFilter extends ModelFilter
 {
     public function activityId($activity)
     {
-        return $this->where('activity_id', $activityId);
+        return $this->where('activity_id', $activity);
     }
 
     public function userName($userName)
@@ -25,4 +25,11 @@ class UserGameFilter extends ModelFilter
             return $q->where('phone', 'like', $userPhone.'%');
         });
     }
+
+    public function gameName($gameName)
+    {
+        return $this->whereHas('game', function($q) use ($gameName) {
+            return $q->where('name', 'like', '%'.$gameName.'%');
+        });
+    }
 }

app/Models/Filters/UserGiftFilter.php

@@ -9,7 +9,7 @@ class UserGiftFilter extends ModelFilter
 {
     public function activityId($activity)
     {
-        return $this->where('activity_id', $activityId);
+        return $this->where('activity_id', $activity);
     }
 
     public function userName($userName)
@@ -25,4 +25,9 @@ class UserGiftFilter extends ModelFilter
             return $q->where('phone', 'like', $userPhone.'%');
         });
     }
+
+    public function state($state)
+    {
+        return $this->where('state', $state);
+    }
 }