Merge branch 'master' into develop

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -112,6 +112,7 @@ class BookingOrderController extends AdminController
         $grid->export(function ($export) {
             $export->filename('预约订单');
     });
+        $status_arr = Order::getStatus();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
@@ -140,8 +141,21 @@ class BookingOrderController extends AdminController
                 return '服务包支付('.$name.')';
             }
         });
-        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消',6=>'已超时',7=>'已预约']);
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款']);
+        $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
+            $info = $status_arr[intval($w)];
+            if($w == 1 || $w == 2){
+                return '<span class="label label-warning">'.$info.'</span>';
+            } else if( $w == 4 ){
+                return '<span class="label label-success">'.$info.'</span>';
+            } else if($w == 7 || $w == 3 ){
+                return '<span class="label label-info">'.$info.'</span>';
+            } else if($w == 6){
+                return '<span class="label label-danger">'.$info.'</span>';
+            } else {
+                return '<span class="label label-default">'.$info.'</span>';
+            }
+        });;
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);;
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -96,6 +96,7 @@ class ConsultingOrdersController extends AdminController
             $export->filename('咨询订单');
             $export->except(['is_evaluates']);
         });
+        $status_arr = Order::getStatus();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
@@ -118,8 +119,21 @@ class ConsultingOrdersController extends AdminController
                 return '服务包支付('.$name.')';
             }
         });
-        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消',6=>'已超时',7=>'已预约']);
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款']);
+        $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
+            $info = $status_arr[intval($w)];
+            if($w == 1 || $w == 2){
+                return '<span class="label label-warning">'.$info.'</span>';
+            } else if( $w == 4 ){
+                return '<span class="label label-success">'.$info.'</span>';
+            } else if($w == 7 || $w == 3 ){
+                return '<span class="label label-info">'.$info.'</span>';
+            } else if($w == 6){
+                return '<span class="label label-danger">'.$info.'</span>';
+            } else {
+                return '<span class="label label-default">'.$info.'</span>';
+            }
+        });
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款',5=>'待退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -57,6 +57,7 @@ class RechargeOrderController extends AdminController
             // 去掉编辑
             $actions->disableEdit();
         });
+        $status_arr = Order::getStatus();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user_id', __('用户id'));
@@ -64,8 +65,21 @@ class RechargeOrderController extends AdminController
         $grid->column('user.phone', __('用户电话'));
         $grid->column('product_type', __('产品类型'))->using([7=>'充值订单']);
         $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付']);
-        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
+        $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
+            $info = $status_arr[intval($w)];
+            if($w == 1 || $w == 2){
+                return '<span class="label label-warning">'.$info.'</span>';
+            } else if( $w == 4 ){
+                return '<span class="label label-success">'.$info.'</span>';
+            } else if($w == 7 || $w == 3 ){
+                return '<span class="label label-info">'.$info.'</span>';
+            } else if($w == 6){
+                return '<span class="label label-danger">'.$info.'</span>';
+            } else {
+                return '<span class="label label-default">'.$info.'</span>';
+            }
+        });
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger']);;
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -65,6 +65,7 @@ class ServicePackOrderController extends AdminController
         $grid->export(function ($export) {
             $export->filename('服务包开通订单');
         });
+        $status_arr = Order::getStatus();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('order_sn', __('订单编号'));
@@ -79,8 +80,21 @@ class ServicePackOrderController extends AdminController
         });
         $grid->column('product_type', __('产品类型'))->using([6=>'服务包订单']);
         $grid->column('payment_type', __('支付方式'))->using([1=>'微信支付',2=>'余额支付']);
-        $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
-        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
+        $grid->column('order_status', __('订单状态'))->display(function ($w) use ($status_arr) {
+            $info = $status_arr[intval($w)];
+            if($w == 1 || $w == 2){
+                return '<span class="label label-warning">'.$info.'</span>';
+            } else if( $w == 4 ){
+                return '<span class="label label-success">'.$info.'</span>';
+            } else if($w == 7 || $w == 3 ){
+                return '<span class="label label-info">'.$info.'</span>';
+            } else if($w == 6){
+                return '<span class="label label-danger">'.$info.'</span>';
+            } else {
+                return '<span class="label label-default">'.$info.'</span>';
+            }
+        });
+        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款'])->label([1=>'warring',2=>'success',3=>'info',4=>'danger']);;
         $grid->column('total_amount', __('订单总金额'))->display(function ($money){
             return $money/100;
         });

app/Admin/Controllers/UserManagement/DocterManagement/AppointController.php

@@ -26,7 +26,10 @@ class AppointController extends AdminController
     {
         $grid = new Grid(new DocterSetting());
         $grid->disableCreateButton();
-        $grid->disableActions();
+        $grid->actions(function ($actions){
+           $actions->disableDelete();
+           $actions->disableView();
+        });
         $grid->disableBatchActions();
         $docter_id = request('docter_id');
         $grid->model()->where('docter_id',$docter_id)->where('type',1);
@@ -119,17 +122,7 @@ class AppointController extends AdminController
     protected function form()
     {
         $form = new Form(new DocterSetting());
-
-        $form->number('docter_id', __('Docter id'));
-        $form->number('type', __('Type'));
-        $form->number('status', __('Status'));
-        $form->number('show_days', __('Show days'));
-        $form->number('service_times', __('Service times'));
-        $form->number('service_num', __('Service num'));
-        $form->number('org_id', __('Org id'));
-        $form->decimal('appoint_price', __('Appoint price'))->default(0.00);
-        $form->text('service_time', __('Service time'));
-
+        $form->decimal('appoint_price', __('预约价格'))->default(0.00);
         return $form;
     }
 }

app/Admin/Controllers/UserManagement/DocterManagement/ChatController.php

@@ -27,7 +27,9 @@ class ChatController extends AdminController
     {
         $grid = new Grid(new DocterTimes());
         $grid->disableCreateButton();
-        $grid->disableActions();
+        $grid->actions(function ($actions){
+           $actions->disableDelete();
+        });
         $grid->disableBatchActions();
         $docter_id = request('docter_id');
         $grid->model()->where('docter_id',$docter_id)->where('type',2);
@@ -93,7 +95,6 @@ class ChatController extends AdminController
         $show = new Show(DocterTimes::findOrFail($id));
 
         $show->field('id', __('Id'));
-        $show->field('docter_id', __('Docter id'));
         $show->field('base_price', __('Base price'));
         $show->field('step_price', __('Step price'));
         $show->field('service_time', __('Service time'));
@@ -115,13 +116,7 @@ class ChatController extends AdminController
     {
         $form = new Form(new DocterTimes());
 
-        $form->number('docter_id', __('Docter id'));
-        $form->decimal('base_price', __('Base price'));
-        $form->decimal('step_price', __('Step price'));
-        $form->text('service_time', __('Service time'));
-        $form->number('person', __('Person'));
-        $form->number('type', __('Type'));
-        $form->number('relation_id', __('Relation id'));
+        $form->decimal('base_price', __('基础价格'));
 
         return $form;
     }

app/Admin/Controllers/UserManagement/DocterManagement/PhoneController.php

@@ -26,7 +26,10 @@ class PhoneController extends AdminController
     {
         $grid = new Grid(new DocterTimes());
         $grid->disableCreateButton();
-        $grid->disableActions();
+        $grid->actions(function ($actions){
+           $actions->disableView();
+           $actions->disableDelete();
+        });
         $grid->disableBatchActions();
         $docter_id = request('docter_id');
         $grid->model()->where('docter_id',$docter_id)->where('type',1);
@@ -116,13 +119,8 @@ class PhoneController extends AdminController
     {
         $form = new Form(new DocterTimes());
 
-        $form->number('docter_id', __('Docter id'));
-        $form->decimal('base_price', __('Base price'));
-        $form->decimal('step_price', __('Step price'));
-        $form->text('service_time', __('Service time'));
-        $form->number('person', __('Person'));
-        $form->number('type', __('Type'));
-        $form->number('relation_id', __('Relation id'));
+        $form->decimal('base_price', __('基础价格'));
+        $form->decimal('step_price', __('步进价格'));
 
         return $form;
     }