|
@@ -179,7 +179,7 @@ class Relation extends Api
|
|
|
$message = [
|
|
|
'user_id' => $to_uid,
|
|
|
'title' => '关系审核',
|
|
|
- 'content' => '有人想和你成为'.$relation['name'],
|
|
|
+ 'content' => $this->auth->nickname . '申请与你成为'.$relation['name'],
|
|
|
'createtime' => time(),
|
|
|
'status' => 0,
|
|
|
'infotype' => 'newrelation',//建立关系
|
|
@@ -190,11 +190,11 @@ class Relation extends Api
|
|
|
//发起人也要发消息
|
|
|
//系统消息
|
|
|
$to_nickname = Db::name('user')->where('id',$to_uid)->value('nickname');
|
|
|
- $msg_id = \app\common\model\Message::addMessage($this->auth->id,'申请关系','您正在申请与'.$to_nickname.'成为'.$relation_name.'关系,请等待对方处理');
|
|
|
+ $msg_id = \app\common\model\Message::addMessage($this->auth->id,'申请关系','您正在申请与'.$to_nickname.'成为'.$relation_name.'关系,请等待对方同意');
|
|
|
|
|
|
Db::commit();
|
|
|
|
|
|
- $this->success('申请成功,等待对方同意',$id);
|
|
|
+ $this->success('申请成功,请等待对方同意',$id);
|
|
|
}
|
|
|
|
|
|
//待审核关系
|