|
@@ -30,14 +30,33 @@ class Search extends Api
|
|
|
if($type == 1){
|
|
|
$list = $this->getFate($keyword,$page,$pageNum);
|
|
|
}else{
|
|
|
- $list = Db::name('user')->where('nickname','LIKE','%'.$keyword.'%')->page($page,$pageNum)->select();
|
|
|
+ $list = model('user')->field('id,nickname,avatar,age,constellation,profession,gender')->where('nickname','LIKE','%'.$keyword.'%')->page($page,$pageNum)->select();
|
|
|
+
|
|
|
+ if ($list) {
|
|
|
+
|
|
|
+ $user_fate = Db::name('user_fate');
|
|
|
+ foreach ($list as &$v) {
|
|
|
+ $fate_info = $user_fate->where(['user_id' => $this->auth->id, 'fate_user_id' => $v['id'], 'createtime' => ['egt', time() - 86400]])->find();
|
|
|
+ if ($fate_info) {
|
|
|
+ $v['is_fate'] = 1;
|
|
|
+ $v['countdown'] = $fate_info['createtime'] + 86400 - time();
|
|
|
+ } else {
|
|
|
+ $v['is_fate'] = 0;
|
|
|
+ $v['countdown'] = 0; //倒计时时间
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
$this->success('success',$list);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* 获取眼缘视频/影集
|
|
|
*/
|
|
|
public function getFate($keyword = '',$page,$pageNum) {
|