Merge branch 'hotfix-phoenix' into develop

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -69,19 +69,20 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
 
                 $state = $actions->row->state;
+                $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-primary btn-sm">详情</div>'));
+
                 if ($state == 2) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-danger">接单</div>', 3));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-danger btn-sm">接单</div>', 3));
                 } elseif ($state == 311) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-warning">完成</div>', 4));
-                    $actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-warning btn-sm">完成</div>', 4));
+                    $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
                 } elseif ($state == 3) {
-                    $actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
-                    $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-info">自送</div>'));
+                    $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
+                    $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-info btn-sm">自送</div>'));
                 } elseif ($state == 8) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-secondary">同意退款</div>', 9));
-                    $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-secondary">拒绝退款</div>'));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-secondary btn-sm">同意</div>', 9));
+                    $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-secondary btn-sm">拒绝</div>'));
                 }
-                $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-primary">详情</div>'));
             });
 
 
@@ -90,6 +91,8 @@ class ImsCjdcOrderMainController extends AdminController
                 if (!(Admin::user()->isRole('market_service'))){
                     $filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket());
                 }
+                $filter->between('created_at','下单时间')->datetime();
+                $filter->between('money','订单金额');
             });
 
             $grid->disableViewButton();

app/Admin/Repositories/ImsCjdcOrderMain.php

@@ -17,6 +17,7 @@ class ImsCjdcOrderMain extends EloquentRepository
 
     public function get(Grid\Model $model)
     {
+
         $builder = new \App\Models\ImsCjdcOrderMain();
         $builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id')
             ->with('market')
@@ -33,6 +34,12 @@ class ImsCjdcOrderMain extends EloquentRepository
                 $value['arguments'][1] = $this->getGridColumns();
             } elseif ($value['method'] == 'get') {
                 $value['arguments'] = [$this->getGridColumns()];
+            }elseif ($value['method']=='whereBetween'){
+                if ($value['arguments'][0]=='created_at'){
+                    $value['arguments'][0] = 'lanzu_order_main.created_at';
+                    $value['arguments'][1][0] = strtotime($value['arguments'][1][0]);
+                    $value['arguments'][1][1] = strtotime($value['arguments'][1][1]);
+                }
             }
             $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
         });

config/admin.php

@@ -157,7 +157,9 @@ return [
         | The global Grid action display class.
         |--------------------------------------------------------------------------
         */
-        'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class,
+        //'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class,
+        'grid_action_class' => Dcat\Admin\Grid\Displayers\Actions::class,
+        //'grid_action_class' => Dcat\Admin\Grid\Displayers\ContextMenuActions::class,
     ],
 
     /*