|
@@ -59,7 +59,7 @@ class HomeController extends Controller
|
|
$fens = UserCareUser::where('other_user_id',$user_id)->get();
|
|
$fens = UserCareUser::where('other_user_id',$user_id)->get();
|
|
$user = UserInfoModel::find($user_id);
|
|
$user = UserInfoModel::find($user_id);
|
|
if (count($user) == 0) return $this->error(ErrorCode::USER_DOES_NOT_EXIST);
|
|
if (count($user) == 0) return $this->error(ErrorCode::USER_DOES_NOT_EXIST);
|
|
- $user = $this->getUser();
|
|
|
|
|
|
+// $user = $this->getUser();
|
|
$emotion = BaseDictionaryOptionModel::where(['dictionary_code' => 'emotion'])->
|
|
$emotion = BaseDictionaryOptionModel::where(['dictionary_code' => 'emotion'])->
|
|
where('dictionary_table_code','user_info')->
|
|
where('dictionary_table_code','user_info')->
|
|
where(['value' => $user->emotion])->first();
|
|
where(['value' => $user->emotion])->first();
|
|
@@ -88,11 +88,8 @@ class HomeController extends Controller
|
|
$sup_dream->pics = $sup_dream->imgs;
|
|
$sup_dream->pics = $sup_dream->imgs;
|
|
}
|
|
}
|
|
$is_care = UserCareUser::where('other_user_id',$user_id)->where('user_id',$user->id)->first();
|
|
$is_care = UserCareUser::where('other_user_id',$user_id)->where('user_id',$user->id)->first();
|
|
-// dump($user->id);
|
|
|
|
-// dd($user_id);
|
|
|
|
$is_care = empty($is_care) ? 0 : 1 ;
|
|
$is_care = empty($is_care) ? 0 : 1 ;
|
|
return $this->api(compact('user','near_dream','sup_dreams','imgs','dreams','score','is_care'));
|
|
return $this->api(compact('user','near_dream','sup_dreams','imgs','dreams','score','is_care'));
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// 关注用户
|
|
// 关注用户
|