|
@@ -81,13 +81,13 @@ class Userfollow extends Api
|
|
|
|
|
|
//亲密度列表
|
|
|
$intimacy = Db::name('user_intimacy')->alias('ui')
|
|
|
- ->field(['ui.id','ui.uid','ui.other_uid','ui.value','ui.level','
|
|
|
- u.nickname as u_nickname','u.avatar as u_avatar','ua.requesttime as ua_requesttime','
|
|
|
- ou.nickname as ou_nickname','ou.avatar as ou_avatar','oua.requesttime as oua_requesttime'])
|
|
|
+ ->field(['ui.id','ui.uid','ui.other_uid','ui.value','ui.level',
|
|
|
+ 'u.nickname as u_nickname','u.avatar as u_avatar','u.is_active as u_is_active',/*'ua.requesttime as ua_requesttime',*/
|
|
|
+ 'ou.nickname as ou_nickname','ou.avatar as ou_avatar','ou.is_active as ou_is_active '/*,'oua.requesttime as oua_requesttime'*/])
|
|
|
->join('user u' ,'ui.uid = u.id','LEFT')
|
|
|
- ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
|
|
|
+// ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
|
|
|
->join('user ou' ,'ui.other_uid = ou.id','LEFT')
|
|
|
- ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
|
|
|
+// ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
|
|
|
->where('(ui.uid = '.$this->auth->id.') or (ui.other_uid = '.$this->auth->id.')')
|
|
|
->where('ui.value','gt','0.1')
|
|
|
->order('ui.value desc, ui.id desc')->select();
|
|
@@ -102,18 +102,20 @@ class Userfollow extends Api
|
|
|
'id' => $val['other_uid'],
|
|
|
'nickname' => $val['ou_nickname'],
|
|
|
'avatar' => $val['ou_avatar'],
|
|
|
- 'requesttime' => $val['oua_requesttime'],
|
|
|
+// 'requesttime' => $val['oua_requesttime'],
|
|
|
+ 'is_active' => $val['ou_is_active'],
|
|
|
'intimacy' => $val['value'],
|
|
|
- 'requesttime_text' => get_last_time($val['oua_requesttime']),
|
|
|
+// 'requesttime_text' => get_last_time($val['oua_requesttime']),
|
|
|
];
|
|
|
}else{
|
|
|
$newval = [
|
|
|
'id' => $val['uid'],
|
|
|
'nickname' => $val['u_nickname'],
|
|
|
'avatar' => $val['u_avatar'],
|
|
|
- 'requesttime' => $val['ua_requesttime'],
|
|
|
+// 'requesttime' => $val['ua_requesttime'],
|
|
|
+ 'is_active' => $val['u_is_active'],
|
|
|
'intimacy' => $val['value'],
|
|
|
- 'requesttime_text' => get_last_time($val['ua_requesttime']),
|
|
|
+// 'requesttime_text' => get_last_time($val['ua_requesttime']),
|
|
|
];
|
|
|
}
|
|
|
$result[] = $newval;
|