枚举优化

application/api/controller/User.php

@@ -433,7 +433,7 @@ class User extends Api
 
         }
 
-        //第一次传入性别，头像只能用默认
+        //第一次传入性别，头像只能用默认，因为自传头像需要审核
         if(isset($data['gender']) && $user_audit_switch == 1){
             $data['avatar'] = $data['gender'] == 1 ? config('avatar_boy') : config('avatar_girl');
         }

application/api/controller/Usercenter.php

@@ -76,13 +76,6 @@ class Usercenter extends Api
 
         //合并
         $userinfo = array_merge($userinfo,$new_data);
-        //枚举
-        $userinfo['tag']   = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
-        $userinfo['hobby'] = Db::name('enum_hobby')->where('id','IN',$userinfo['hobby_ids'])->field(['id','name'])->select();
-        $userinfo['marital'] = Db::name('enum_marital')->where('id',$userinfo['marital_id'])->value('name');
-        $userinfo['suqiu'] = Db::name('enum_suqiu')->where('id',$userinfo['suqiu_id'])->value('name');
-        $userinfo['job'] = Db::name('enum_job')->where('id',$userinfo['job_id'])->value('name');
-        $userinfo['wages'] = Db::name('enum_wages')->where('id',$userinfo['wages_id'])->value('name');
 
         //vip
         $userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
@@ -91,7 +84,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_black = Db::name('user_black')->where(['uid'=>$this->auth->id,'black_uid'=>$uid])->find();
@@ -165,13 +158,6 @@ class Usercenter extends Api
 
         //合并
         $userinfo = array_merge($userinfo,$new_data);
-        //枚举
-        $userinfo['tag']   = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
-        $userinfo['hobby'] = Db::name('enum_hobby')->where('id','IN',$userinfo['hobby_ids'])->field(['id','name'])->select();
-        $userinfo['marital'] = Db::name('enum_marital')->where('id',$userinfo['marital_id'])->value('name');
-        $userinfo['suqiu'] = Db::name('enum_suqiu')->where('id',$userinfo['suqiu_id'])->value('name');
-        $userinfo['job'] = Db::name('enum_job')->where('id',$userinfo['job_id'])->value('name');
-        $userinfo['wages'] = Db::name('enum_wages')->where('id',$userinfo['wages_id'])->value('name');
 
         //vip
         $userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
@@ -180,7 +166,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_black = Db::name('user_black')->where(['uid'=>$this->auth->id,'black_uid'=>$uid])->find();

application/common/library/Auth.php

@@ -499,9 +499,6 @@ class Auth
         ];
 
         $userinfo = array_merge($userinfo,$new_data);
-        //枚举
-        $userinfo['tag'] = Db::name('enum_tag')->where('id','IN',$this->tag_ids)->field(['id','name'])->select();
-        $userinfo['hobby'] = Db::name('enum_hobby')->where('id','IN',$this->hobby_ids)->field(['id','name'])->select();
 
         //钱包
         $userwallet = Db::name('user_wallet')->where('user_id',$this->id)->find();