diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php
index 3ac2da7..587a8ae 100644
--- a/application/api/controller/Room.php
+++ b/application/api/controller/Room.php
@@ -169,8 +169,9 @@ class Room extends BaseCom
     {
         $room_id = input('room_id', 0);
         $to_uid = input('to_uid', 0);//收礼人ID
-        $heart_id = input('heart_id', 0);
-        $reslut = model('Room')->room_gift_all_clear($this->uid, $room_id, $to_uid,$heart_id);
+        $heart_id = input('heart_id', 0);//交友
+        $auction_id = input('auction_id');//竞拍
+        $reslut = model('Room')->room_gift_all_clear($this->uid, $room_id, $to_uid,$heart_id,$auction_id);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 2886fa3..c09e8f5 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1297,15 +1297,18 @@ class Room extends Model
     }
 
     //背包礼物一键全清
-    public function room_gift_all_clear($uid, $room_id, $user_id,$heart_id)
+    public function room_gift_all_clear($uid, $room_id, $user_id,$heart_id,$auction_id = 0)
     {
         $user_gift_pack = db::name('vs_user_gift_pack')->where(['user_id'=>$uid,'is_tester'=>1,'is_use_give'=>1,'num'=>['>',0]])->select();
         if (empty($user_gift_pack)) {
             return ['code' => 0, 'msg' => '用户背包礼物不足', 'data' => null];
         }
         foreach ($user_gift_pack as $v){
-//            model('GiveGift')->give_gift($uid, $user_id, $v['gid'], $v['num'],2,2, $room_id);
-            $this->room_gift($uid, $user_id, $v['gid'], $v['num'],2,$room_id, 0,$heart_id);
+            if($auction_id){//竞拍
+                model('RoomAuction')->room_auction_join($auction_id,$uid,$v['gid'],$v['num'],2);
+            }else{
+                $this->room_gift($uid, $user_id, $v['gid'], $v['num'],2,$room_id, 0,$heart_id);
+            }
         }
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }