Browse Source

接口改动

lizhen_gitee 3 years ago
parent
commit
4d8c14f2c2

+ 1 - 2
application/api/controller/Area.php

@@ -15,8 +15,7 @@ class Area extends Api
     public function area_list(){
         $pid = input_post('pid',0);
 
-        $fields = 'name,content,updatetime';
-        $list = Db::name('area')->field($fields)->where('pid',$pid)->order('id asc')->column(['id','pid','name']);
+        $list = Db::name('area')->field('id,pid,name')->where('pid',$pid)->order('id asc')->select();
 
         $this->success('success',$list);
     }

+ 12 - 10
application/api/controller/User.php

@@ -250,36 +250,38 @@ class User extends Api
      */
     public function profile()
     {
-        $field_array = ['nickname','gender','birthday','height','weight','bio','audio_bio','avatar','photo_images','education_id','hobby_ids','job_id','marital_id','tag_ids','wages_id','hometown_cityid'];
+        $field_array = ['nickname','gender','birthday','height','weight','bio','audio_bio','avatar','photo_images','education_id','hobby_ids','job_id','marital_id','tag_ids','wages_id','hometown_cityid','hide_is_finishinfo'];
 
         $data = [];
         foreach($field_array as $key => $field){
 
-            $newone = input_post($field);
+            if(!input('?'.$field)){
+                continue;
+            }
+
+            $newone = input($field);
 
             if($field == 'avatar'){
-                $newone = input_post('avatar', '', 'trim,strip_tags,htmlspecialchars');
+                $newone = input('avatar', '', 'trim,strip_tags,htmlspecialchars');
             }
             if($field == 'photo_images'){
-                $newone = input_post('avatar', '', 'trim,strip_tags,htmlspecialchars');
+                $newone = input('avatar', '', 'trim,strip_tags,htmlspecialchars');
             }
 
-            if(!empty($newone)){
-                $data[$field] = $newone;
-            }
+            $data[$field] = $newone;
         }
 
         if(isset($data['birthday'])){
             $data['birthday'] = strtotime($data['birthday']);
         }
         if(isset($data['avatar'])){
-            $data['real_status'] = -1;  //或许应该改成0
+            $data['real_status'] = -1;  //或许应该改成0。性别不能改所以不需要
         }
         if(isset($data['hobby_ids'])){
-            $data['hobby_ids'] = implode(',',explode(',',$data['hobby_ids']));  //或许应该改成0
+            $data['hobby_ids'] = implode(',',explode(',',$data['hobby_ids']));
         }
         if(isset($data['tag_ids'])){
-            $data['tag_ids'] = implode(',',explode(',',$data['tag_ids']));  //或许应该改成0
+            $data['tag_ids'] = implode(',',explode(',',$data['tag_ids']));
         }
         //dump($data);
         if(empty($data)){

+ 4 - 0
application/api/controller/Usercenter.php

@@ -108,6 +108,10 @@ class Usercenter extends Api
         $is_like   = Db::name('user_like')->where(['uid'=>$this->auth->id,'like_uid'=>$uid])->find();
         $userinfo['is_like'] = $is_like ? 1 : 0;
 
+        //是否拉黑
+        $is_black = Db::name('user_black')->where(['uid'=>$this->auth->id,'black_uid'=>$uid])->find();
+        $userinfo['is_black'] = $is_black ? 1 : 0;
+
         //查看别人信息,就要留下痕迹
         $data = [
             'uid' => $this->auth->id,

+ 1 - 0
application/common/library/Auth.php

@@ -59,6 +59,7 @@ class Auth
         'wages_id',
 
         'hometown_cityid',
+        'hide_is_finishinfo',
     ];
 
     public function __construct($options = [])