Merge branch 'hotfix-phoenix' into develop

app/Admin/Controllers/ImsCjdcOrderMainController.php

@@ -54,14 +54,14 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->order_num;
             $grid->state('订单状态')
                 ->using(config('order.state'))
-                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning']);
+                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning',311=>'#bd10e0']);
             $grid->money;
             $grid->column('market.name', '所属市场');
             $grid->pay_time('支付时间')->display(function ($time) {
                 if ($time){
                     return date('Y-m-d H:i:s',$time);
                 }
-                return '未支付';
+                return '<span style="color: #ceccce">未支付</span>';
             });
             $grid->created_at('下单时间')->display(function ($time) {
                 return date('Y-m-d H:i:s',$time);

app/Admin/Forms/SelectHorseman.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Forms;
 
+use App\Admin\Common\Auth;
 use App\Models\ImsCjdcOrderMain;
 use App\Models\LanzuServiceHorseman;
 use App\Models\v3\LanzuEmployees;
@@ -41,11 +42,11 @@ class SelectHorseman extends Form
     public function form()
     {
         $this->select('horseman_id','配送员')
-            ->options(LanzuEmployees::getHorseman())
+            ->options(LanzuEmployees::getHorseman(Auth::getMarket()))
             ->required();
 
-        $this->text('order_id');
-        $this->text('current_page');
+        $this->hidden('order_id');
+        $this->hidden('current_page');
     }
 
 

app/Models/v3/LanzuEmployees.php

@@ -75,9 +75,10 @@ class LanzuEmployees extends Model
         if ($marketId){
             $rows = self::where('market_id',$marketId)
                 ->where('position','REGEXP','"29"')
+                ->where('status',1)
                 ->get();
         }else{
-            $rows = self::where('position','REGEXP','"29"')->get();
+            $rows = self::where('position','REGEXP','"29"')->where('status',1)->get();
         }
         $item         = [];
         if ($rows){