123

@@ -354,13 +354,22 @@ class Car extends Base
         $page=$this->request->param("page");
         $page=$this->request->param("page");
         $total=$this->request->param("total");
         $total=$this->request->param("total");
         $driver=Db::name("driver")->where("user_id",$this->auth->id)->find();
         $driver=Db::name("driver")->where("user_id",$this->auth->id)->find();
-
+        $w['driver_id'] = $driver["id"];
+        if ($order_status!=0){
+            $w['order_status'] = $order_status;
+        }
         $res=Db::name("order")
         $res=Db::name("order")
-            ->where("driver_id",$driver["id"])
+            ->alias("a")
+            ->join("route b","a.route_id=b.id")
+            ->field("a.*,b.start_address,b.end_address")
+            ->where($w)
             ->limit($page,$total)
             ->limit($page,$total)
             ->select();
             ->select();
         $amount=Db::name("order")
         $amount=Db::name("order")
-            ->where("driver_id",$driver["id"])
+            ->alias("a")
+            ->join("route b","a.route_id=b.id")
+            ->field("a.*,b.start_address,b.end_address")
+            ->where($w)
             ->count();
             ->count();
         $data=["data"=>$res,"amount"=>$amount];
         $data=["data"=>$res,"amount"=>$amount];
         return $this->success("请求成功",$data);
         return $this->success("请求成功",$data);