瀏覽代碼

feat: 优化排序

xiansin 2 年之前
父節點
當前提交
deacaab8de

+ 1 - 1
server/app/Admin/Actions/Grid/UserConsumeRecord.php

xqd
@@ -34,7 +34,7 @@ class UserConsumeRecord extends AbstractTool
     {
         $id = \request()->input('key');
         return Grid::make(new UserConsumeRecordModel, function (Grid $grid) use ($id){
-            $grid->model()->where('user_id',$id);
+            $grid->model()->where('user_id',$id)->orderByDesc('created_at');;
             $grid->column('id')->sortable();
             $grid->column('type',admin_trans('user-consume-record.fields.type'))
                 ->using(config('global.consume_type'))

+ 1 - 1
server/app/Admin/Actions/Grid/UserEpisodeRecord.php

xqd
@@ -27,7 +27,7 @@ class UserEpisodeRecord extends RowAction implements LazyRenderable
     {
         $id = \request()->input('key');
         return Grid::make(UserEpisodesRecord::with(['user','episodes']), function (Grid $grid) use ($id){
-            $grid->model()->where('user_id',$id);
+            $grid->model()->where('user_id',$id)->orderByDesc('created_at');;
             $grid->column('id')->sortable();
             $grid->column('episodes.name','短剧名称')->label('info');
             $grid->column('list_id','第几集')->label('primary');

+ 1 - 1
server/app/Admin/Actions/Grid/UserRechargeRecord.php

xqd
@@ -36,7 +36,7 @@ class UserRechargeRecord extends RowAction implements LazyRenderable
     {
         $id = \request()->input('key');
         return Grid::make(UserRechargeRecordModel::with(['user','combo']), function (Grid $grid) use ($id){
-            $grid->model()->where('user_id',$id);
+            $grid->model()->where('user_id',$id)->orderByDesc('created_at');;
             $grid->column('id')->sortable();
 
             $grid->column('pay_id','订单号');

+ 1 - 0
server/app/Admin/Controllers/Order/UserConsumeRecordController.php

xqd
@@ -19,6 +19,7 @@ class UserConsumeRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(UserConsumeRecord::with(['user.info']), function (Grid $grid) {
+            $grid->model()->orderByDesc('created_at');
             $grid->column('id')->sortable();
             $grid->column('user_id','用户')->display(function () {
                 $str  = "";

+ 1 - 0
server/app/Admin/Controllers/Order/UserEpisodesRecordController.php

xqd
@@ -20,6 +20,7 @@ class UserEpisodesRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(UserEpisodesRecord::with(['user','episodes']), function (Grid $grid) {
+            $grid->model()->orderByDesc('created_at');
             $grid->column('id')->sortable();
             $grid->column('user_id')->display(function () {
                 $str  = "";

+ 1 - 1
server/app/Admin/Controllers/Order/UserRechargeRecordController.php

xqd
@@ -20,7 +20,7 @@ class UserRechargeRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(UserRechargeRecord::with(['user.info','combo','pay']), function (Grid $grid) {
-            $grid->model()->where('status',1);
+            $grid->model()->where('status',1)->orderByDesc('created_at');;
             $grid->column('id')->sortable();
             $grid->column('pay_id','订单号');
             $grid->column('user_id')->display(function () {

+ 2 - 1
server/app/Admin/Controllers/Share/UserController.php

xqd
@@ -19,7 +19,8 @@ class UserController extends AdminController
     protected function grid()
     {
         return Grid::make(User::with(['parent.info','info'])->withCount('child'), function (Grid $grid) {
-            $grid->model()->where('is_share', 1);
+            $grid->model()->where('is_share', 1)
+                ->orderByDesc('become_share_at');;
             $grid->column('id','用户ID');
             $grid->column('avatar', '基本信息')->display(function () {
                 $str  = "";

+ 4 - 4
server/app/Admin/Controllers/UserVipRecordController.php

xqd
@@ -18,16 +18,16 @@ class UserVipRecordController extends AdminController
     protected function grid()
     {
         return Grid::make(UserVipRecord::with(['user.info','combo']), function (Grid $grid) {
-            $grid->model()->where('status',1);
+            $grid->model()->where('status',1)->orderByDesc('created_at');;
             $grid->column('id')->sortable();
             $grid->column('pay_id');
             $grid->column('user_id')->display(function () {
                 $str  = "";
                 $str .= "<div style='margin-right:10px;display: flex;align-items: center'>";
-                $str .= '<img data-action="preview-img" src="' . $this->user->avatar . '" onerror="this.src=\'https://fourtiao.oss-cn-beijing.aliyuncs.com/zhangsiye/images/6b40343b27263be34cf3212bf44f74c3.png\'" style="height:50px;width:50px;cursor:pointer;margin-right:10px;" class="img img-thumbnail">';
+                $str .= '<img data-action="preview-img" src="' . @$this->user->avatar . '" onerror="this.src=\'https://fourtiao.oss-cn-beijing.aliyuncs.com/zhangsiye/images/6b40343b27263be34cf3212bf44f74c3.png\'" style="height:50px;width:50px;cursor:pointer;margin-right:10px;" class="img img-thumbnail">';
                 $str .= '<div>';
-                $str .= '<p style="margin-bottom: 5px">' . $this->user->nickname . '</p>';
-                $str .= '<p style="margin-bottom: 0px">' . $this->user->mobile . '</p>';
+                $str .= '<p style="margin-bottom: 5px">' . @$this->user->nickname . '</p>';
+                $str .= '<p style="margin-bottom: 0px">' . @$this->user->mobile . '</p>';
                 $str .= "</div>";
                 $str .= "</div>";
                 return $str;