更新

app/Admin/Controllers/DataCenter/FinancialOrderOverview.php

@@ -27,16 +27,16 @@ class FinancialOrderOverview
             ->row('<h1 text-align="center">订单走势</h1>')
             ->row(function (Row $row) {
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('今日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTodayPay()));
+                    $column->append(infoBox('今日支付金额', 'dropbox', '', 'green', FinancialSta::getTodayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('昨日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getYesterdayPay()));
+                    $column->append(infoBox('昨日支付金额', 'dropbox', '', 'green', FinancialSta::getYesterdayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('近七日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getSevenDayPay()));
+                    $column->append(infoBox('近七日支付金额', 'dropbox', '', 'green', FinancialSta::getSevenDayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('近三十日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getOneMonthPay()));
+                    $column->append(infoBox('近三十日支付金额', 'dropbox', '', 'green', FinancialSta::getOneMonthPay()));
                 });
             })
             ->row(function (Row $row){

app/Admin/Controllers/DataCenter/FinancialOverview.php

@@ -28,28 +28,28 @@ class FinancialOverview
             ->row(function (Row $row) {
                 // 产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('收入总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalIncome()));
+                    $column->append(infoBox('收入总金额', 'dropbox', '', 'green', FinancialSta::getTotalIncome()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('退款总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalRefund()));
+                    $column->append(infoBox('退款总金额', 'dropbox', '', 'green', FinancialSta::getTotalRefund()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('用户充值总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalRecharge()));
+                    $column->append(infoBox('用户充值总金额', 'dropbox', '', 'green', FinancialSta::getTotalRecharge()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('用户总余额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalUserBalance()));
+                    $column->append(infoBox('用户总余额', 'dropbox', '', 'green', FinancialSta::getTotalUserBalance()));
                 });
             })
             ->row('<h1 text-align="center">充值记录</h1>')
             ->row(function (Row $row){
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('当日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTodayReCharge()));
+                    $column->append(infoBox('当日充值金额', 'dropbox', '', 'green', FinancialSta::getTodayReCharge()));
                 });
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('近七日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getSevenDayReCharge()));
+                    $column->append(infoBox('近七日充值金额', 'dropbox', '', 'green', FinancialSta::getSevenDayReCharge()));
                 });
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('近三十日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getOneMonthReCharge()));
+                    $column->append(infoBox('近三十日充值金额', 'dropbox', '', 'green', FinancialSta::getOneMonthReCharge()));
                 });
             })
             ->row(function (Row $row){

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -120,29 +120,7 @@ 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('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/UserManagement/DocterManagement/ApproveController.php

@@ -35,6 +35,7 @@ class ApproveController extends AdminController
             $filter->disableIdFilter();
             $filter->like('docter.name','医生姓名');
             $filter->like('organization.name','机构名');
+            $filter->equal('state', '认证状态')->select([1=>'已认证',2=>'审核驳回',3=>'待审核']);
             $filter->between('authentication_time', '签约时间')->datetime();
             $filter->between('authentication_end_time', '签约到期时间')->datetime();
         });