多个接口微调

application/api/controller/User.php

@@ -723,10 +723,12 @@ class User extends Api
     {
         $user = $this->auth->getUser();
 
-        $user->status = "cancel";
-        unset($user->power);
+        $user->status = -1;
+        //unset($user->power);
         $user->save();
 
+        $this->auth->logout();
+
         $this->success("账号注销成功！");
     }
 
@@ -773,7 +775,7 @@ class User extends Api
         $this->success('获取成功',$result);
     }
 
-    //微信登录
+    //微信登录,预先假注册
     public function wechatlogin(){
 
         $code = $this->request->param('code','');

application/api/controller/Usercenter.php

@@ -47,7 +47,7 @@ class UserCenter extends Common
         $where = [];
         $where["id"] = $user_id;
         $userInfo = $this->userModel->field("id,nickname,pre_nickname,image,mobile,avatar,pre_avatar,gender,age,u_id,level,jewel,
-        age_id,constellation_id,province_id,city_id,desc,ipaddress,is_cool,is_manager,is_stealth,charm_level,wealth_level")->where($where)->find();
+        age_id,constellation_id,province_id,city_id,desc,is_cool,is_manager,is_stealth,charm_level,wealth_level")->where($where)->find();
 
         //用户钱包
         $userwallet = Db::name('user_wallet')->where('user_id',$user_id)->find();
@@ -432,7 +432,7 @@ class UserCenter extends Common
         if(!empty($list)){
             foreach($list as $key => &$val){
                 //关注
-                $val['is_follow'] = $this->is_follow($val['user_id'],$this->auth->id);
+                $val['is_follow'] = $this->is_follow($this->auth->id,$val['user_id']);
             }
         }
 
@@ -443,7 +443,7 @@ class UserCenter extends Common
      * 获取附近的人
      * (消息-同城)
      */
-    public function getSamecityList(){
+    /*public function getSamecityList(){
 
         if(!$this->auth->city_id){
             $this->success(1,[]);
@@ -471,10 +471,10 @@ class UserCenter extends Common
         }
 
         $this->success(1,$list);
-    }
+    }*/
 
     //是否关注
-    private function is_follow($user_id,$fans_id){
+    /*private function is_follow($user_id,$fans_id){
         $where = [
             'user_id' => $user_id,
             'fans_id' => $fans_id,
@@ -485,7 +485,7 @@ class UserCenter extends Common
         }else{
             return 0;
         }
-    }
+    }*/
 
 
     /**
@@ -658,7 +658,7 @@ class UserCenter extends Common
     /**
      * 编辑个人信息(修改昵称和头像需要后台审核)
      */
-    public function editUser() {
+    /*public function editUser() {
         $avatar = $this->request->request('avatar'); // 头像
         $nickname = $this->request->request('nickname'); // 昵称
         if (!$avatar && !$nickname) {
@@ -684,7 +684,7 @@ class UserCenter extends Common
             }
         }
         $this->success("修改成功！");
-    }
+    }*/
     /**
      * 主播申请
      */

application/common/library/Auth.php

@@ -28,8 +28,10 @@ class Auth
     protected $config = [];
     protected $options = [];
     protected $allowFields = ['id', 'u_id', 'username', 'nickname', 'mobile', 'pre_userid', 'has_info', 'is_auth',
-        'is_anchor', 'is_guild', 'guild_id', 'avatar', 'empirical', 'image','level', 'gender', 'age',
-        'ipaddress','wealth_level','charm_level'];
+         'is_guild', 'guild_id', 'avatar', 'empirical', 'image','level', 'gender', 'age_id',
+        'wealth_level','charm_level',
+        'job_id', 'longitude', 'latitude','province_id','city_id'
+    ];
 
     public function __construct($options = [])
     {
@@ -401,7 +403,7 @@ class Auth
                     Token::clear($user->id);
                 }
 
-                $user->ipaddress = newip_to_address();
+                //$user->ipaddress = newip_to_address();
 
                 $ip = request()->ip();
                 $time = time();
@@ -482,7 +484,6 @@ class Auth
     public function getUserinfo()
     {
         $data = $this->_user->toArray();
-        // 获取粉丝数
 
         $allowFields = $this->getAllowFields();
         $userinfo = array_intersect_key($data, array_flip($allowFields));