Browse Source

vue_admin_action

Panda 3 months ago
parent
commit
942c9b5abf

+ 4 - 1
application/api/controller/Hotel.php

@@ -212,8 +212,11 @@ class Hotel extends Api
         $user_id = $this->auth->id;
 
         $query = HotelOrderModel::with([
-            'room'=>function ($query) {
+            'hotel' => function ($query) {
                 $query->field(['id','name','image']);
+            },
+            'room'=>function ($query) {
+                $query->field(['id','name','image','space','floor','is_wifi','window','breakfast','people_num','bad']);
             }
         ])->where('id',$params['id'])->where('user_id',$user_id);
 

+ 5 - 0
application/common/model/HotelOrderModel.php

@@ -33,6 +33,11 @@ class HotelOrderModel extends Model
         return $value;
     }
 
+    public function hotel()
+    {
+        return $this->hasOne(HotelModel::class, 'id', 'hotel_id');
+    }
+
     public function room()
     {
         return $this->hasOne(HotelRoomModel::class, 'id', 'room_id');