132

@@ -97,7 +97,7 @@ class Car extends Base
         if($number<=0){
         if($number<=0){
             $this->error("人数错误");
             $this->error("人数错误");
         }
         }
-        //查询线路
+       //查询线路
         $route=Db::name("route")->where("id",$route_id)->find();
         $route=Db::name("route")->where("id",$route_id)->find();
         //查询车辆
         //查询车辆
         $car=Db::name("car")->where("id",$car_id)->find();
         $car=Db::name("car")->where("id",$car_id)->find();
@@ -108,6 +108,7 @@ class Car extends Base
             "price"=>bcmul($route['price'],$number,2),
             "price"=>bcmul($route['price'],$number,2),
             "is_pay"=>"2",//未支付
             "is_pay"=>"2",//未支付
             "car_id"=>$car_id,
             "car_id"=>$car_id,
+            "route_id"=>$route_id,
             "user_id"=>$this->auth->id,
             "user_id"=>$this->auth->id,
             "phone"=>$phone,
             "phone"=>$phone,
             "user_name"=>$user_name,
             "user_name"=>$user_name,
@@ -142,6 +143,7 @@ class Car extends Base
 
 
     }
     }
 
 
+
     /**
     /**
      * 查询乘车人信息
      * 查询乘车人信息
      * @return void
      * @return void
@@ -215,10 +217,16 @@ class Car extends Base
             $w['is_pay'] = $is_pay;
             $w['is_pay'] = $is_pay;
         }
         }
         $res=Db::name("order")
         $res=Db::name("order")
+            ->alias("a")
+            ->join("route b","a.route_id=b.id")
+            ->field("a.*,b.start_address,b.end_address")
             ->where($w)
             ->where($w)
             ->limit($page,$total)
             ->limit($page,$total)
             ->select();
             ->select();
         $amount=Db::name("order")
         $amount=Db::name("order")
+            ->alias("a")
+            ->join("route b","a.route_id=b.id")
+            ->field("a.*,b.start_address,b.end_address")
             ->where($w)
             ->where($w)
             ->count();
             ->count();
         $data=["data"=>$res,"amount"=>$amount];
         $data=["data"=>$res,"amount"=>$amount];
@@ -357,6 +365,10 @@ class Car extends Base
         $data=["data"=>$res,"amount"=>$amount];
         $data=["data"=>$res,"amount"=>$amount];
         return $this->success("请求成功",$data);
         return $this->success("请求成功",$data);
     }
     }
+    
+    public function selectbydriverlist(){
+
+    }
 
 
     /**
     /**
      *认证声明
      *认证声明