Sfoglia il codice sorgente

订单状态显示问题处理

whj 4 anni fa
parent
commit
21b065dd1b
2 ha cambiato i file con 8 aggiunte e 3 eliminazioni
  1. 3 3
      app/Community/Controllers/OrderController.php
  2. 5 0
      app/Models/Patient.php

+ 3 - 3
app/Community/Controllers/OrderController.php

xqd xqd
@@ -64,7 +64,7 @@ class OrderController extends AdminController
         });;
         $grid->column('docter.name', __('预约医生'));
 //        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
-        $grid->column('order_status','订单状态')->using(Order::getStatus())->label([1=>'info',2=>'warring',3=>'info',4=>'success',5=>'error']);
+        $grid->column('order_status','订单状态')->using(Order::getStatus())->label([1=>'info',2=>'warring',3=>'info',4=>'success',5=>'danger']);
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
         //查询
         $grid->quickSearch(function ($model, $query) {
@@ -114,8 +114,8 @@ class OrderController extends AdminController
         $show->field('orderPatient.appoint_end_time', __('结束时间'));
         $show->field('orderPatient.birthday', __('患者年龄'));
         $show->field('docter.name', __('预约医生'));
-        $show->field('order_status', __('订单状态'))->using(Order::getStatus());
-        $show->field('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
+        $show->field('order_status', __('订单状态'))->using(Order::getStatus())->label('info');
+        $show->field('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label('info');
         $show->panel()->tools(function ($tools) {
                 $tools->disableEdit();
                 $tools->disableDelete();

+ 5 - 0
app/Models/Patient.php

xqd
@@ -52,4 +52,9 @@ class Patient extends BaseModel
     public function order(){
         return $this->hasMany(Order::class);
     }
+
+    public function user(){
+        return $this->hasOne(User::class,'id','user_id');
+    }
+    
 }