后台把多列表图显示代码优化

app/Admin/Controllers/BaseConfigController.php

@@ -20,44 +20,21 @@ class BaseConfigController extends AdminController
         $grid = new Grid(new SystemConfig);
 
         $grid->column('id')->sortable();
+        $grid->column('comment')->editable()->width(150);
         $grid->column('group')->editable();
         $grid->column('key')->editable();
         $grid->column('value')->copyable()->width(150);
-        $grid->column('chinese')->editable();
-        $grid->column('fieldType')->select(SystemConfig::getType());
-        $grid->column('comment')->editable()->width(150);
         $grid->column('updated_at')->sortable();
         $grid->quickSearch(function ($model, $query) {
             $model->where('group', 'like', "%{$query}%")
                 ->orWhere('key', 'like', "%{$query}%")
                 ->orWhere('value', 'like', "%{$query}%");
         });
+        $grid->disableActions();
+        $grid->disableBatchActions();
         return $grid;
     }
 
-    /**
-     * Make a show builder.
-     *
-     * @param mixed   $id
-     * @return \Encore\Admin\Show
-     */
-    protected function detail($id)
-    {
-        $show = new Show(SystemConfig::findOrFail($id));
-
-        $show->field('id');
-        $show->field('group');
-        $show->field('key');
-        $show->field('value');
-        $show->field('fieldType')->using(SystemConfig::getType());
-        $show->field('chinese');
-        $show->field('comment');
-        $show->field('created_at');
-        $show->field('updated_at');
-
-        return $show;
-    }
-
     /**
      * Make a form builder.
      *
@@ -67,11 +44,9 @@ class BaseConfigController extends AdminController
     {
         $form = new Form(new SystemConfig);
         $form->display('id');
+        $form->text('comment');
         $form->text('group');
         $form->text('key');
-        $form->text('chinese');
-        $form->select('fieldType')->options(SystemConfig::getType());
-        $form->text('comment');
         $form->textarea('value');
         $form->display('created_at');
         $form->display('updated_at');

app/Admin/Controllers/GameUserController.php

@@ -71,7 +71,7 @@ class GameUserController extends AdminController
             $game_user_score = (new GameUserScore())->setTable('gu')->from('game_user_scores as gu')
                 ->where('gu.game_user_id', $this->id)
                 ->leftJoin('course_holes as ch', 'ch.id', '=', 'gu.hole_id')
-                ->select('gu.score', 'ch.sort', 'ch.par', 'ch.course_id')
+                ->select('gu.score', 'ch.sort', 'ch.par', 'ch.course_field_id')
                 ->orderBy('sort', 'asc')
                 ->get()
                 ->toArray();

app/Admin/Controllers/OrderController.php

@@ -36,7 +36,7 @@ class OrderController extends AdminController
                 return $str;
             });
             $grid->column('order_no');
-            $grid->column('integral');
+            $grid->column('total_integral');
             $grid->column('goods_id')->display(function (){
                 $str = "";
                 if($this->goods){

app/Admin/Controllers/TeamPhotoController.php

@@ -26,30 +26,16 @@ class TeamPhotoController extends AdminController
         $grid->column('id')->sortable();
         $grid->column('team.name',trans('team-photo.fields.team_id'));
         $grid->column('user.name',trans('team-photo.fields.user_id'));
-        $grid->column('photo_urls')->display(function ($res){
-            if(isset($res)&&!empty($res)){
-                $res = json_decode($res,true);
-                $str = '';
-                if(!empty($res)&&is_array($res)&&count($res)>0){
-                    foreach ($res as $item){
-                        $str.='<img data-action="preview-img" src="'.$item['url'].'" style="max-width:50px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
-                    }
-                }
-                return $str;
-            }else{
-                return "";
-            }
-        });
+        $grid->column('photo_urls')->display(function ($photo_urls){
+            return json_decode($photo_urls, true);
+        })->image('', '60', '60');
         $grid->column('sort')->sortable();
         $grid->column('created_at');
         $grid->filter(function (Grid\Filter $filter) {
-            $filter->equal('id');
-            $filter->like('user.name',trans('user.fields.name'));
-            $team = Team::query()->select(['id','name'])->get()->toArray();
-            foreach ($team as $v){
-                $team_arr[$v['id']] = $v['name'];
-            }
-            $filter->equal('team_id',trans('team.labels.team'))->select($team_arr);
+            $filter->panel();
+            $filter->equal('id')->width(4);
+            $filter->like('user.name',trans('user.fields.name'))->width(4);
+            $filter->equal('team_id',trans('team.labels.team'))->width(4);
         });
 
         $grid->actions(function (Grid\Displayers\Actions $actions) {

app/Admin/Controllers/UserFeedbackController.php

@@ -24,38 +24,25 @@ class UserFeedbackController extends AdminController
         $grid->model()->with(['user:id,name'])->orderByDesc('id');
 
         $grid->column('id')->sortable();
-        $grid->column('user.name',trans('user-feedback.fields.user_id'));
+        $grid->column('user.name', trans('user-feedback.fields.user_id'));
         $grid->column('content');
-        $grid->column('file')->display(function ($v){
-            if(isset($v)&&!empty($v)){
-                $v = json_decode($v,true);
-                $str = '';
-                if(is_array($v)&&count($v)>0){
-                    foreach ($v as $item){
-                        $str.='<img data-action="preview-img" src="'.$item.'" style="max-width:50px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
-                    }
-                }
-                return $str;
-            }else{
-                return "";
-            }
-        });
-        $grid->column('status')->using([0=>trans('user-report.fields.untreated'),1=>trans('user-report.fields.processed')])->label(['red','green']);
+        $grid->column('file')->display(function ($file) {
+            return json_decode($file, true);
+        })->image('', '60', '60');
+        $grid->column('status')->using([0 => trans('user-report.fields.untreated'), 1 => trans('user-report.fields.processed')])->label(['red', 'green']);
         $grid->column('created_at');
-//        $grid->column('updated_at')->sortable();
-
         $grid->filter(function (Grid\Filter $filter) {
             $filter->equal('id');
             $filter->like('user.name');
             $filter->like('content');
-            $filter->equal('status')->select(['0'=>trans('user-report.fields.untreated'),'1'=>trans('user-report.fields.processed')]);
+            $filter->equal('status')->select(['0' => trans('user-report.fields.untreated'), '1' => trans('user-report.fields.processed')]);
         });
 
         $grid->actions(function (Grid\Displayers\Actions $actions) {
             $actions->disableView();
             $actions->disableEdit();
             $actions->disableDelete();
-            if($actions->row->status==0){
+            if ($actions->row->status == 0) {
                 $actions->append(new Report(UserFeedback::class));
             }
         });

app/Admin/menu.php

@@ -128,6 +128,13 @@ return [
         'uri' => 'operate',
         'parent_id' => 0,
     ],
+    [
+        'id' => 33,
+        'title' => trans('menu.Integral_setting', [], $lang),
+        'icon' => '',
+        'uri' => 'integral_setting',
+        'parent_id' => 11
+    ],
     [
         'id' => 19,
         'title' => trans('menu.Avatar', [], $lang),
@@ -200,17 +207,6 @@ return [
         'parent_id' => 30
     ],
 
-    /**
-     * 系统配置
-     * ------------------------------------------
-     */
-    [
-        'id' => 12,
-        'title' => trans('menu.Setting', [], $lang),
-        'icon' => 'fa-gears',
-        'uri' => 'setting',
-        'parent_id' => 0
-    ],
 
 
 ];

app/Admin/routes.php

@@ -31,8 +31,8 @@ Route::group([
     $router->resource('/game_user_scores', 'GameUserController');
     $router->resource('/user_identify', 'UserIdentifyController');
     $router->resource('/course_user', 'CourseUserController');
-
     $router->resource('/goods', 'GoodsController');
     $router->resource('/order', 'OrderController');
+    $router->resource('/integral_setting', 'IntegralSettingController');
 
 });

public/request.log

@@ -224,3 +224,221 @@
 2022-06-29 17:33:41---language-handle-
 2022-06-29 17:34:06---language-handle-
 2022-06-29 17:35:44---language-handle-
+2022-06-30 09:30:55---language-handle-
+2022-06-30 09:36:41---language-handle-
+2022-06-30 09:40:54---language-handle-
+2022-06-30 09:40:56---language-handle-
+2022-06-30 09:40:57---language-handle-
+2022-06-30 09:40:57---language-handle-
+2022-06-30 09:40:58---language-handle-
+2022-06-30 09:40:58---language-handle-
+2022-06-30 09:40:58---language-handle-
+2022-06-30 09:40:58---language-handle-
+2022-06-30 09:40:58---language-handle-
+2022-06-30 09:40:59---language-handle-
+2022-06-30 09:41:02---language-handle-
+2022-06-30 09:41:04---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:07---language-handle-
+2022-06-30 09:41:32---language-handle-
+2022-06-30 09:41:42---language-handle-
+2022-06-30 09:41:45---language-handle-
+2022-06-30 09:41:47---language-handle-
+2022-06-30 09:41:50---language-handle-
+2022-06-30 09:43:23---language-handle-
+2022-06-30 09:43:29---language-handle-
+2022-06-30 09:43:38---language-handle-
+2022-06-30 09:43:47---language-handle-
+2022-06-30 09:43:51---language-handle-
+2022-06-30 09:49:22---language-handle-
+2022-06-30 09:49:25---language-handle-
+2022-06-30 09:50:51---language-handle-
+2022-06-30 09:51:20---language-handle-
+2022-06-30 09:52:01---language-handle-
+2022-06-30 09:52:17---language-handle-
+2022-06-30 10:06:19---language-handle-
+2022-06-30 10:06:45---language-handle-
+2022-06-30 10:06:48---language-handle-
+2022-06-30 10:06:57---language-handle-
+2022-06-30 10:07:01---language-handle-
+2022-06-30 10:08:46---language-handle-
+2022-06-30 10:09:45---language-handle-
+2022-06-30 10:10:30---language-handle-
+2022-06-30 10:30:46---language-handle-
+2022-06-30 10:31:29---language-handle-
+2022-06-30 10:31:48---language-handle-
+2022-06-30 10:36:36---language-handle-
+2022-06-30 10:36:54---language-handle-
+2022-06-30 10:37:54---language-handle-
+2022-06-30 10:37:59---language-handle-
+2022-06-30 10:38:04---language-handle-
+2022-06-30 10:38:10---language-handle-
+2022-06-30 10:40:07---language-handle-
+2022-06-30 10:40:08---language-handle-
+2022-06-30 10:42:10---language-handle-
+2022-06-30 10:42:17---language-handle-
+2022-06-30 10:42:20---language-handle-
+2022-06-30 10:45:17---language-handle-
+2022-06-30 10:45:20---language-handle-
+2022-06-30 10:46:57---language-handle-
+2022-06-30 10:46:59---language-handle-
+2022-06-30 10:47:04---language-handle-
+2022-06-30 10:47:05---language-handle-
+2022-06-30 10:48:13---language-handle-
+2022-06-30 10:48:17---language-handle-
+2022-06-30 11:09:19---language-handle-
+2022-06-30 11:09:25---language-handle-
+2022-06-30 11:09:27---language-handle-
+2022-06-30 11:59:08---language-handle-
+2022-06-30 11:59:19---language-handle-
+2022-06-30 11:59:20---language-handle-
+2022-06-30 12:00:11---language-handle-
+2022-06-30 12:00:13---language-handle-
+2022-06-30 12:02:04---language-handle-
+2022-06-30 12:02:11---language-handle-
+2022-06-30 12:02:12---language-handle-
+2022-06-30 12:03:27---language-handle-
+2022-06-30 12:04:05---language-handle-
+2022-06-30 12:04:35---language-handle-
+2022-06-30 12:04:56---language-handle-
+2022-06-30 12:04:58---language-handle-
+2022-06-30 12:05:02---language-handle-
+2022-06-30 12:05:45---language-handle-
+2022-06-30 13:42:02---language-handle-
+2022-06-30 13:42:32---language-handle-
+2022-06-30 13:42:36---language-handle-
+2022-06-30 13:42:45---language-handle-
+2022-06-30 13:42:48---language-handle-
+2022-06-30 13:42:58---language-handle-
+2022-06-30 13:43:06---language-handle-
+2022-06-30 13:43:10---language-handle-
+2022-06-30 13:44:52---language-handle-
+2022-06-30 13:46:11---language-handle-
+2022-06-30 13:47:31---language-handle-
+2022-06-30 13:48:27---language-handle-
+2022-06-30 13:49:04---language-handle-
+2022-06-30 13:49:08---language-handle-
+2022-06-30 13:49:29---language-handle-
+2022-06-30 13:50:06---language-handle-
+2022-06-30 13:50:32---language-handle-
+2022-06-30 13:51:30---language-handle-
+2022-06-30 13:51:40---language-handle-
+2022-06-30 13:51:44---language-handle-
+2022-06-30 13:53:47---language-handle-
+2022-06-30 13:54:17---language-handle-
+2022-06-30 13:54:19---language-handle-
+2022-06-30 13:54:41---language-handle-
+2022-06-30 13:54:45---language-handle-
+2022-06-30 13:55:15---language-handle-
+2022-06-30 13:56:41---language-handle-
+2022-06-30 13:57:42---language-handle-
+2022-06-30 13:58:41---language-handle-
+2022-06-30 13:59:54---language-handle-
+2022-06-30 14:00:05---language-handle-
+2022-06-30 14:00:05---language-handle-
+2022-06-30 14:01:32---language-handle-
+2022-06-30 14:01:51---language-handle-
+2022-06-30 14:01:59---language-handle-
+2022-06-30 14:02:26---language-handle-
+2022-06-30 14:02:35---language-handle-
+2022-06-30 14:03:03---language-handle-
+2022-06-30 14:03:13---language-handle-
+2022-06-30 14:03:17---language-handle-
+2022-06-30 14:04:27---language-handle-
+2022-06-30 14:05:38---language-handle-
+2022-06-30 14:05:41---language-handle-
+2022-06-30 14:05:43---language-handle-
+2022-06-30 14:05:52---language-handle-
+2022-06-30 14:05:54---language-handle-
+2022-06-30 14:05:56---language-handle-
+2022-06-30 14:07:05---language-handle-
+2022-06-30 14:15:36---language-handle-
+2022-06-30 14:22:01---language-handle-
+2022-06-30 14:22:24---language-handle-
+2022-06-30 14:22:29---language-handle-
+2022-06-30 14:22:33---language-handle-
+2022-06-30 14:22:40---language-handle-
+2022-06-30 14:22:47---language-handle-
+2022-06-30 14:23:39---language-handle-
+2022-06-30 14:24:22---language-handle-
+2022-06-30 14:24:37---language-handle-
+2022-06-30 14:24:38---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:39---language-handle-
+2022-06-30 14:24:40---language-handle-
+2022-06-30 14:26:34---language-handle-
+2022-06-30 14:26:41---language-handle-
+2022-06-30 14:26:45---language-handle-
+2022-06-30 14:27:09---language-handle-
+2022-06-30 15:04:51---language-handle-
+2022-06-30 15:05:17---language-handle-
+2022-06-30 15:05:30---language-handle-
+2022-06-30 15:05:45---language-handle-
+2022-06-30 15:06:22---language-handle-
+2022-06-30 15:06:53---language-handle-
+2022-06-30 15:09:58---language-handle-
+2022-06-30 15:11:04---language-handle-
+2022-06-30 15:13:01---language-handle-
+2022-06-30 15:13:55---language-handle-
+2022-06-30 15:16:28---language-handle-
+2022-06-30 15:25:08---language-handle-
+2022-06-30 15:25:27---language-handle-
+2022-06-30 15:32:51---language-handle-
+2022-06-30 15:52:21---language-handle-
+2022-06-30 16:06:04---language-handle-
+2022-06-30 16:57:02---language-handle-
+2022-06-30 16:57:29---language-handle-
+2022-06-30 16:58:21---language-handle-
+2022-06-30 16:58:41---language-handle-
+2022-06-30 16:59:36---language-handle-
+2022-06-30 17:09:32---language-handle-
+2022-06-30 17:31:15---language-handle-
+2022-06-30 17:37:06---language-handle-
+2022-06-30 17:37:40---language-handle-
+2022-06-30 17:38:30---language-handle-
+2022-06-30 17:38:53---language-handle-
+2022-06-30 17:39:11---language-handle-
+2022-06-30 17:39:51---language-handle-
+2022-06-30 17:40:47---language-handle-
+2022-06-30 17:41:04---language-handle-
+2022-06-30 18:02:05---language-handle-
+2022-06-30 18:03:23---language-handle-
+2022-06-30 19:11:14---language-handle-
+2022-06-30 19:11:38---language-handle-
+2022-06-30 19:14:26---language-handle-
+2022-06-30 19:18:01---language-handle-
+2022-06-30 19:21:22---language-handle-
+2022-06-30 19:22:10---language-handle-
+2022-06-30 19:26:24---language-handle-
+2022-06-30 19:33:04---language-handle-
+2022-06-30 19:34:06---language-handle-
+2022-06-30 19:41:29---language-handle-
+2022-06-30 19:46:49---language-handle-
+2022-06-30 19:47:18---language-handle-
+2022-06-30 19:48:52---language-handle-
+2022-06-30 19:51:32---language-handle-
+2022-06-30 19:54:05---language-handle-
+2022-06-30 19:55:28---language-handle-
+2022-06-30 19:55:55---language-handle-
+2022-06-30 20:17:26---language-handle-
+2022-06-30 20:18:36---language-handle-
+2022-06-30 20:19:04---language-handle-
+2022-06-30 20:19:07---language-handle-
+2022-06-30 20:19:09---language-handle-
+2022-06-30 20:23:38---language-handle-
+2022-06-30 20:23:42---language-handle-
+2022-06-30 20:24:26---language-handle-
+2022-06-30 20:25:39---language-handle-
+2022-06-30 20:25:45---language-handle-
+2022-06-30 20:25:48---language-handle-