Merge branch 'master' into develop

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -109,6 +109,9 @@ class BookingOrderController extends AdminController
                 }
             }
         });
+        $grid->export(function ($export) {
+            $export->filename('预约订单');
+    });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -92,6 +92,10 @@ class ConsultingOrdersController extends AdminController
             $actions->disableDelete();
             $actions->add(new OrderOpinion());
         });
+        $grid->export(function ($export) {
+            $export->filename('咨询订单');
+            $export->except(['is_evaluates']);
+        });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));

app/Admin/Controllers/OrdersManagement/InsuranceListController.php

@@ -42,6 +42,9 @@ class InsuranceListController extends AdminController
             $filter->equal('users.phone','用户电话');
             $filter->equal('is_need_insurance','是否包含保单')->select([0=>'否',1=>'是']);
         });
+        $grid->export(function ($export) {
+            $export->filename('投保信息');
+        });
         $grid->disableCreateButton();
         //实现只有服务包中包含保单的才显示进来
 

app/Admin/Controllers/OrdersManagement/RechargeOrderController.php

@@ -48,7 +48,9 @@ class RechargeOrderController extends AdminController
             );
             $filter->timestampBetween('payment_time', "支付时间")->datetime();
         });
-
+        $grid->export(function ($export) {
+            $export->filename('充值订单');
+        });
         $grid->actions(function ($actions) {
             // 去掉删除
             $actions->disableDelete();

app/Admin/Controllers/OrdersManagement/RefundApplicationController.php

@@ -43,6 +43,9 @@ class RefundApplicationController extends AdminController
             $filter->equal('orders.payment_status','支付状态')->select([3=>'退款中',4=>'已退款']);
             $filter->equal('orders.order_status','订单状态')->select([5=>'已取消',6=>'已超时']);
         });
+        $grid->export(function ($export) {
+            $export->filename('退款申请列表');
+        });
         $grid->actions(function ($actions){
            $actions->disableView();
            $actions->disableEdit();

app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php

@@ -62,6 +62,9 @@ class ServicePackOrderController extends AdminController
             $actions->add(new ServicePack());
             $actions->add(new ServicePackOrderList());
         });
+        $grid->export(function ($export) {
+            $export->filename('服务包开通订单');
+        });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('order_sn', __('订单编号'));