交友相关 直播间送礼

application/api/model/Friend.php

@@ -38,7 +38,7 @@ class Friend extends Model
             db::name('vs_room')->where(['id' => $room_id])->update(['step' => 2]);
 
            //推送给前端消息
-            $text['text'] = '拍卖开始';
+            $text['text'] = '交友开始';
             $text['step'] = 2;
             model('api/Chat')->sendMsg(1039,$room_id,$text);
             return ['code' => 1, 'msg' => '操作成功！', 'data' => ['friend_id' => $id]];
@@ -225,7 +225,7 @@ class Friend extends Model
      * @param $room_id 房间id
      * @param $pit_number 坑位
      */
-    public function room_give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number)
+    public function room_give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number,$heart_id)
     {
         $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,$from_type,$type, $room_id,$pit_number);
         if($res['code'] != 1){