Преглед на файлове

fix(controller): 排序和时区错误

xiansin преди 4 години
родител
ревизия
8bf1e64830

+ 1 - 1
app/Admin/Controllers/IncomeRecordController.php

xqd
@@ -19,7 +19,7 @@ class IncomeRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(new UserShare(), function (Grid $grid) {
-            $grid->with(['user','child','user.parent']);
+            $grid->model()->with(['user','child','user.parent'])->orderBy('id','desc');
             $grid->column('id')->sortable();
             $grid->column('user_id','名称')->display(function () {
                 return $this->user->nickname;

+ 1 - 1
app/Admin/Controllers/MemberController.php

xqd
@@ -19,7 +19,7 @@ class MemberController extends AdminController
     protected function grid()
     {
         return Grid::make(new UserVip(), function (Grid $grid) {
-            $grid->model()->where('status',1);
+            $grid->model()->where('status',1)->orderBy('id','desc');
             $grid->with(['user']);
             $grid->column('id')->sortable();
             $grid->column('user_id','用户')->display(function () {

+ 2 - 0
app/Admin/Controllers/UserController.php

xqd
@@ -18,6 +18,8 @@ class UserController extends AdminController
     protected function grid()
     {
         return Grid::make(new User(), function (Grid $grid) {
+            $grid->model()
+                ->orderBy('id','desc');
             $grid->column('id')->sortable()->width('80px');
             $grid->column('nickname');
             $grid->column('head_img')->image('',80,80);

+ 1 - 1
app/Admin/Controllers/UserWithdrawController.php

xqd
@@ -18,7 +18,7 @@ class UserWithdrawController extends AdminController
     protected function grid()
     {
         return Grid::make(new UserWithdraw(), function (Grid $grid) {
-            $grid->with(['user']);
+            $grid->model()->with(['user'])->orderBy('id','desc');
             $grid->column('id')->sortable();
             $grid->column('user_id','名称')->display(function () {
                 return $this->user->nickname;

+ 1 - 1
config/app.php

xqd
@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------