diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index fe7e2a0..036386e 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -74,6 +74,7 @@ class Friend extends Model } //推送延时 $text['text'] = '延时'; + $text['friend_id'] = $id; $text['end_time'] = db::name('vs_user_friending')->where('id', $id)->value('end_time'); model('api/Chat')->sendMsg(1050,$room_id,$text); return ['code' => 1, 'msg' => '操作成功!', 'data' => null]; @@ -129,6 +130,7 @@ class Friend extends Model $text['text'] = $step == 1 ? '交友结束' : '牵手良缘'; $text['step'] = $step;//1 等待邂逅 2 心动连线 3 牵手良缘 $text['friend_user'] = $return; + $text['friend_id'] = $id; model('api/Chat')->sendMsg(1049,$room_id,$text); // 修改当前交友阶段 db::name('vs_room')->where(['id' => $room_id])->setField('step', $step); @@ -178,6 +180,10 @@ class Friend extends Model $text['room_id'] = $room_id['data'];//前端用来让用户跳转的房间id $text['user1_id'] = $user1;//进小房间的用户id $text['user2_id'] = $user2;//进小房间的用户id + $text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar'); + $text['user1_nickname'] = db::name('user')->where(['id'=>$user1])->value('nickname'); + $text['user2_avatar'] = db::name('user')->where(['id'=>$user2])->value('avatar'); + $text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname'); model('api/Chat')->sendMsg(1051,$room_id,$text); } }else{