Merge branch 'master' into develop

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Admin\Actions\backstage\Orders;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class OrderOpinion extends RowAction
+{
+    public $name = '病例意见单';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+
+        return $this->response()->success('跳转病例意见单成功')->redirect('/admin/user_suggests?id='.$this->row->id.'');
+
+    }
+
+}

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers\OrdersManagement;
 
 use App\Admin\Actions\backstage\Orders\Evaluate;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
+use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\RefundApplicationAction;
 use App\Admin\Actions\backstage\User\MapDepot;
 use App\Admin\Actions\backstage\User\Suggests;
@@ -89,6 +90,7 @@ class ConsultingOrdersController extends AdminController
             $actions->disableView();
             $actions->disableEdit();
             $actions->disableDelete();
+            $actions->add(new OrderOpinion());
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();

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

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers\UserManagement\BmUser;
 
+use App\Admin\Actions\backstage\Orders\OrderOpinion;
 use App\Admin\Actions\backstage\Orders\ServicePack;
 use App\Models\Order;
 use Encore\Admin\Controllers\AdminController;
@@ -31,7 +32,9 @@ class UserOrdersController extends AdminController
             $filter->disableIdFilter();
 //            $filter->equal('user_id','用户id');
         });
-        $grid->disableActions();
+        $grid->actions(function ($actions){
+           $actions->add(new OrderOpinion()); 
+        });
         $grid->model()->where('user_id',$uesr_id)->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user_id', __('用户id'))->sortable()->hide();
@@ -86,13 +89,34 @@ class UserOrdersController extends AdminController
             return $money/100;
         });
         $grid->column('payment_time', __('支付时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }
+            else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         $grid->column('receiving_time', __('接单时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }
+            else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         $grid->column('end_time', __('订单完成时间'))->display(function ($time){
-            return date('Y-m-d H:i:s',$time);
+            if ($time == 0)
+            {
+                return '';
+            }
+            else
+            {
+                return date('Y-m-d H:i:s',$time);
+            }
         });
         return $grid;
     }