|
@@ -74,6 +74,7 @@ class Usercenter extends Api
|
|
|
|
|
|
$field = $this->allowFields;
|
|
|
$field[] = 'longitude';
|
|
|
+ $field[] = 'latitude';
|
|
|
$field[] = '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(longitude,latitude))*111195) as distance';
|
|
|
$userinfo = Db::name('user')->field($field)->where('id',$uid)->find();
|
|
|
|
|
@@ -83,11 +84,10 @@ class Usercenter extends Api
|
|
|
|
|
|
//用户数据
|
|
|
$userinfo = info_domain_image($userinfo,['avatar','photo_images']);
|
|
|
- $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
|
|
|
|
|
|
$new_data = [
|
|
|
'age' => birthtime_to_age($userinfo['birthday']),
|
|
|
- 'truename' => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
|
|
|
+ 'truename' => '',
|
|
|
];
|
|
|
|
|
|
//合并
|
|
@@ -102,7 +102,7 @@ class Usercenter extends Api
|
|
|
//是否喜欢和关注
|
|
|
$userinfo['is_follow'] = $this->is_follow($this->auth->id,$uid);
|
|
|
$userinfo['is_fans'] = $this->is_follow($uid,$this->auth->id);
|
|
|
- $userinfo['is_friend'] = $this->is_friend($this->auth->id,$uid);
|
|
|
+ $userinfo['is_friend'] = ($userinfo['is_follow'] && $userinfo['is_fans']) ? 1 : 0;
|
|
|
|
|
|
// $is_like = Db::name('user_like')->where(['uid'=>$this->auth->id,'like_uid'=>$uid])->find();
|
|
|
// $userinfo['is_like'] = $is_like ? 1 : 0;
|
|
@@ -167,6 +167,7 @@ class Usercenter extends Api
|
|
|
|
|
|
$field = $this->allowFields;
|
|
|
$field[] = 'longitude';
|
|
|
+ $field[] = 'latitude';
|
|
|
$field[] = '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(longitude,latitude))*111195) as distance';
|
|
|
$userinfo = Db::name('user')->field($field)->where('id',$uid)->find();
|
|
|
|
|
@@ -176,11 +177,12 @@ class Usercenter extends Api
|
|
|
|
|
|
//用户数据
|
|
|
$userinfo = info_domain_image($userinfo,['avatar','photo_images']);
|
|
|
- $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
|
|
|
+// $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
|
|
|
|
|
|
$new_data = [
|
|
|
'age' => birthtime_to_age($userinfo['birthday']),
|
|
|
- 'truename' => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
|
|
|
+// 'truename' => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
|
|
|
+ 'truename' => '',
|
|
|
];
|
|
|
|
|
|
//合并
|
|
@@ -195,7 +197,10 @@ class Usercenter extends Api
|
|
|
//是否喜欢和关注
|
|
|
$userinfo['is_follow'] = $this->is_follow($this->auth->id,$uid);
|
|
|
$userinfo['is_fans'] = $this->is_follow($uid,$this->auth->id);
|
|
|
- $userinfo['is_friend'] = $this->is_friend($this->auth->id,$uid);
|
|
|
+ $userinfo['is_friend'] = ($userinfo['is_follow'] && $userinfo['is_fans']) ? 1 : 0;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
// $is_like = Db::name('user_like')->where(['uid'=>$this->auth->id,'like_uid'=>$uid])->find();
|
|
|
// $userinfo['is_like'] = $is_like ? 1 : 0;
|