Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php

@@ -30,6 +30,7 @@ class CouponDistributionUserList extends AdminController
         $grid->filter(function($filter){
             $filter->disableIdFilter();
             $filter->like('nickname','昵称');
+            $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
             $filter->equal('status','用户状态')->radio([
                 ''   => '不限',
                 0    => '黑名单',
@@ -49,6 +50,7 @@ class CouponDistributionUserList extends AdminController
         $grid ->model()->where('status','>=','0')->where('is_docter',0);
         $grid->column('id', __('用户id'))->sortable();
         $grid->column('nickname', __('用户名'));
+        $grid->column('phone', __('用户手机号'));
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('age', __('年龄'));
         $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -7,6 +7,7 @@ use App\Models\Order;
 use App\Admin\Actions\backstage\Orders\OrderDetails;
 use App\Models\OrderPack;
 use App\Models\ServicePack;
+use Encore\Admin\Widgets\Table;
 use Encore\Admin\Controllers\AdminController;
 use App\Admin\Actions\backstage\User\MapDepot;
 use App\Admin\Actions\backstage\User\Suggests;
@@ -72,15 +73,7 @@ class BookingOrderController extends AdminController
             });
         });
 
-        $grid->actions(function ($actions) {
-            // 去掉删除
-            $actions->disableDelete();
-            // 去掉编辑
-            $actions->disableEdit();
-//            $actions->add(new MapDepot());
-            $actions->add(new Evaluate());
-//            $actions->add(new Suggests());
-        });
+        $grid->disableActions();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
@@ -93,6 +86,29 @@ class BookingOrderController extends AdminController
         $grid->column('orderPatient.appoint_end_time', __('就诊日期'))->display(function ($time){
             return date('Y-m-d H:i:s',$time);
         });
+        $grid->column('is_evaluates', __('评价详情'))->expand(function ($model){
+            $infos = $model->evaluate()->get()->map(function ($info){
+                return $info->only(['order_id','content','status']);
+            });
+            $infos = $infos->toArray();
+            foreach ($infos as $key => $value)
+            {
+                if (!empty($infos[$key]))
+                {
+                    if ($infos[$key]['status'] == 1)
+                    {
+                        $infos[$key]['status'] = '待审核';
+                    }else if ($infos[$key]['status'] == 2)
+                    {
+                        $infos[$key]['status'] = '审核成功';
+                    }else{
+                        $infos[$key]['status'] = '审核拒绝';
+                    }
+                }
+            }
+            return new Table(['订单id','评价内容','评价状态'],$infos);
+        });
+        $grid->column('evaluate.score', __('订单评分'));
         $grid->column('product_type', __('产品类型'))->using([3=>'门诊预约',4=>'疫苗接种预约',5=>'儿保预约']);
         $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
             if ($payment_type == 1)

app/Admin/Controllers/OrdersManagement/ConsultingOrdersController.php

@@ -9,6 +9,7 @@ use App\Admin\Actions\backstage\User\Suggests;
 use App\Models\Order;
 use App\Models\OrderPack;
 use App\Models\ServicePack;
+use Encore\Admin\Widgets\Table;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -77,16 +78,7 @@ class ConsultingOrdersController extends AdminController
             });
         });
         //操作
-        $grid->actions(function ($actions) {
-            // 去掉删除
-            $actions->disableDelete();
-            // 去掉编辑
-            $actions->disableEdit();
-//            $actions->add(new MapDepot());
-            $actions->add(new Evaluate());
-//            $actions->add(new Suggests());
-
-        });
+        $grid->disableActions();
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
         $grid->column('user.nickname', __('用户姓名'));
@@ -120,8 +112,29 @@ class ConsultingOrdersController extends AdminController
         $grid->column('discount_amount', __('折扣金额'))->display(function ($money){
             return $money/100;
         });
+        $grid->column('is_evaluates', __('评价详情'))->expand(function ($model){
+            $infos = $model->evaluate()->get()->map(function ($info){
+                return $info->only(['order_id','content','status']);
+            });
+            $infos = $infos->toArray();
+            foreach ($infos as $key => $value)
+            {
+                if (!empty($infos[$key]))
+                {
+                    if ($infos[$key]['status'] == 1)
+                    {
+                        $infos[$key]['status'] = '待审核';
+                    }else if ($infos[$key]['status'] == 2)
+                    {
+                        $infos[$key]['status'] = '审核成功';
+                    }else{
+                        $infos[$key]['status'] = '审核拒绝';
+                    }
+                }
+            }
+            return new Table(['订单id','评价内容','评价状态'],$infos);
+        });
         $grid->column('evaluate.score', __('订单评分'));
-        $grid->column('evaluate.status', __('评分状态'))->using([1=>'待审核',2=>'审核通过',3=>'审核拒绝']);
         $grid->column('payment_time', __('支付时间'))->display(function ($time){
             return date('Y-m-d H:i:s',$time);
         });