Browse Source

feat: 修改订单管理

xiansin 2 years ago
parent
commit
47ccd37a2e

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

@@ -48,7 +48,6 @@ class UserEpisodesRecordController extends AdminController
                 $filter->panel();
                 $filter->panel();
                 $filter->equal('user_id','用户ID')->width(3);
                 $filter->equal('user_id','用户ID')->width(3);
                 $filter->like('user.nickname','用户昵称')->width(3);
                 $filter->like('user.nickname','用户昵称')->width(3);
-                $filter->equal('episodes_id','手机号')->width(3);
                 $filter->equal('episodes_id')->select(function (){
                 $filter->equal('episodes_id')->select(function (){
                     return Episode::select(['id','name'])->get()->pluck('name','id')->toArray();
                     return Episode::select(['id','name'])->get()->pluck('name','id')->toArray();
                 })->width(3);
                 })->width(3);

+ 6 - 9
server/app/Admin/Controllers/Order/UserRechargeRecordController.php

@@ -19,7 +19,7 @@ class UserRechargeRecordController extends AdminController
      */
      */
     protected function grid()
     protected function grid()
     {
     {
-        return Grid::make(UserRechargeRecord::with(['user','combo','pay']), function (Grid $grid) {
+        return Grid::make(UserRechargeRecord::with(['user.info','combo','pay']), function (Grid $grid) {
             $grid->model()->where('status',1);
             $grid->model()->where('status',1);
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
             $grid->column('pay_id','订单号');
             $grid->column('pay_id','订单号');
@@ -34,12 +34,11 @@ class UserRechargeRecordController extends AdminController
                 $str .= "</div>";
                 $str .= "</div>";
                 return $str;
                 return $str;
             });
             });
+            $grid->column('user.info.platform','所属平台')
+                ->using(config('global.platform'))
+                ->label(['success','primary']);
             $grid->column('price')->label('danger');
             $grid->column('price')->label('danger');
             $grid->column('combo.name','套餐名称');
             $grid->column('combo.name','套餐名称');
-            $grid->column('pay.order_fee','实付金额')->label('danger');
-//            $grid->column('platform','所属平台')->display(function (){
-//                return $this->user->info->platform;
-//            })->using(config('global.platform'))->label('primary','success');
             $grid->column('gold')->label('info');
             $grid->column('gold')->label('info');
             $grid->column('gift')->label('primary');
             $grid->column('gift')->label('primary');
             //$grid->column('pay_id');
             //$grid->column('pay_id');
@@ -51,10 +50,8 @@ class UserRechargeRecordController extends AdminController
                     ->select(config('global.platform'))
                     ->select(config('global.platform'))
                     ->width(3);
                     ->width(3);
                 $filter->between('created_at','下单时间')->date()->width(4);
                 $filter->between('created_at','下单时间')->date()->width(4);
-                $filter->between('pay_id','订单号')->date()->width(4);
-                $filter->equal('pay.status','订单状态')
-                    ->select(config('global.order_status'))
-                    ->width(3);
+                $filter->equal('pay_id','订单号')->width(4);
+
                 $combos = RechargeCombo::get()->pluck('name','id');
                 $combos = RechargeCombo::get()->pluck('name','id');
                 $filter->equal('combo_id')
                 $filter->equal('combo_id')
                     ->select($combos)
                     ->select($combos)