更新

app/Admin/Actions/backstage/Orders/OrderOpinion.php

@@ -12,8 +12,7 @@ class OrderOpinion extends RowAction
     public function handle(Model $model)
     {
         // $model ...
-
-        return $this->response()->success('跳转病例意见单成功')->redirect('/admin/user_suggests?id='.$this->row->id.'');
+        return $this->response()->success('跳转病例意见单成功')->redirect('/admin/user_suggests?order_id='.$this->row->id.'');
 
     }
 

app/Admin/Controllers/OrdersManagement/UserSuggestsController.php

@@ -28,7 +28,7 @@ class UserSuggestsController extends AdminController
         $grid = new Grid(new Suggest());
         $grid->disableCreateButton();
         $grid->disableActions();
-        $uesr_id = \request('order_id');
+        $order_id = \request('order_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->equal('order_id','订单id');
@@ -36,7 +36,7 @@ class UserSuggestsController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('order_id', __('订单id'));
         $grid->column('user.nickname', __('用户姓名'));
-        $grid->column('Patient.name', __('患者姓名'));
+        $grid->column('OrderPatient.name', __('患者姓名'));
         $grid->column('symptoms', __('病症'))->limit(20,'...');
         $grid->column('pathogen', __('病因'))->limit(20,'...');
         $grid->column('suggest', __('结论建议'))->limit(20,'...');

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -77,9 +77,19 @@ class UserListController extends AdminController
             $grid->column('balance', __('当前余额'))->display(function ($price){
                 return $price/100;
             });
-            $grid->column('created_at', __('注册时间'));
+            $grid->column('created_at', __('注册时间'))->display(function ($time){
+                if ($time == 0 ){
+                    return '';
+                }else{
+                    return $time;
+                }
+            });
             $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
-                return date("Y-m-d H:i",$time);
+                if ($time == 0 ){
+                    return '';
+                }else{
+                    return $time;
+                }
             });
         return $grid;
     }

app/Admin/Controllers/UserManagement/BmUser/UserOrdersController.php

@@ -30,7 +30,7 @@ class UserOrdersController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-//            $filter->equal('user_id','用户id');
+            $filter->equal('user_id','用户id');
         });
         $grid->actions(function ($actions){
             $actions->disableView();

app/Models/Suggest.php

@@ -29,7 +29,10 @@ class Suggest extends BaseModel
     {
         return $this->hasOne(Patient::class,'id','patient_id');
     }
-
+    public function OrderPatient()
+    {
+        return $this->hasOne(OrderPatient::class,'order_id','order_id');
+    }
     /**
      * 意见详情表联查
      * @return mixed