去掉属性和鞋码

application/api/controller/Index.php

@@ -46,20 +46,7 @@ class Index extends Api
         if($gender != 'all'){
             $where['user.gender'] = $gender;
         }
-        //属性
-        $attribute = input('attribute','all');
-        if($attribute != 'all'){
-
-            if($attribute == 'EE'){
-                $where['user.attribute'] = ['IN',['EE','BOTH']];
-            }
-            if($attribute == 'ER'){
-                $where['user.attribute'] = ['IN',['ER','BOTH']];
-            }
-            if($attribute == 'BOTH'){
-                //$where['user.attribute'] = 'BOTH';
-            }
-        }
+        
         //排除黑名单的
         $where_black = [];
         $black_ids = Db::name('user_black')->where(['uid'=>$this->auth->id])->column('black_uid');
@@ -112,7 +99,7 @@ class Index extends Api
             'user.cityname',
             'user.longitude',
             'user.latitude',
-            'user.attribute',
+
             'user.is_active',
 
             'wallet.vip_endtime',
@@ -173,20 +160,7 @@ class Index extends Api
         if($gender != 'all'){
             $where['user.gender'] = $gender;
         }
-        //搜索条件 属性
-        $attribute = input('attribute','all');
-        if($attribute != 'all'){
 
-            if($attribute == 'EE'){
-                $where['user.attribute'] = ['IN',['EE','BOTH']];
-            }
-            if($attribute == 'ER'){
-                $where['user.attribute'] = ['IN',['ER','BOTH']];
-            }
-            if($attribute == 'BOTH'){
-                //$where['user.attribute'] = 'BOTH';
-            }
-        }
 
         //搜索条件 年龄
         $agemin = input('agemin',18);
@@ -249,7 +223,7 @@ class Index extends Api
             'user.cityname',
             'user.longitude',
             'user.latitude',
-            'user.attribute',
+
             'user.is_active',
 
             'wallet.vip_endtime',

application/api/controller/Relation.php

@@ -194,7 +194,7 @@ class Relation extends Api
     //待审核关系
     public function audit_lists(){
         $list = Db::name('user_relation')->alias('ur')
-            ->field('ur.*,relation.name as relation_name,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,uw.vip_endtime')
+            ->field('ur.*,relation.name as relation_name,user.nickname,user.avatar,user.gender,user.birthday,uw.vip_endtime')
             ->join('relation','ur.relation_id = relation.id','LEFT')
             ->join('user','ur.uid = user.id','LEFT')
             ->join('user_wallet uw','ur.uid = uw.user_id','LEFT')

application/api/controller/Topicdongtai.php

@@ -129,7 +129,7 @@ class Topicdongtai extends Api
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime')
             ->where($where)
             ->order('dt.id desc')->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);
@@ -283,20 +283,7 @@ class Topicdongtai extends Api
             $where['user.gender'] = $gender;
         }
 
-        //属性
-        $attribute = input('attribute','all');
-        if($attribute != 'all'){
 
-            if($attribute == 'EE'){
-                $where['user.attribute'] = ['IN',['EE','BOTH']];
-            }
-            if($attribute == 'ER'){
-                $where['user.attribute'] = ['IN',['ER','BOTH']];
-            }
-            if($attribute == 'BOTH'){
-                //$where['user.attribute'] = 'BOTH';
-            }
-        }
 
         //排除黑名单的
         $where_black = [];
@@ -306,7 +293,7 @@ class Topicdongtai extends Api
         }
 
         //列表
-        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime';
+        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime';
         if($order == 'near'){
             $field .= ',(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(dt.longitude,dt.latitude))*111195) as distance';
         }
@@ -389,7 +376,7 @@ class Topicdongtai extends Api
         $info = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime')
             ->where('dt.id',$id)->find();
         $info = info_domain_image($info,['images','audio_file','avatar']);
 
@@ -665,7 +652,7 @@ class Topicdongtai extends Api
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime')
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);
@@ -737,7 +724,7 @@ class Topicdongtai extends Api
         //楼
         $floor_list = Db::name('topic_dongtai_answer')
             ->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
+            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status')
             ->join('user','a.user_id = user.id','LEFT')
             ->where(['a.dt_id'=>$dt_id,'a.level'=>1])->order('a.id desc')->autopage()->select();
         $floor_list = list_domain_image($floor_list,['avatar']);
@@ -786,7 +773,7 @@ class Topicdongtai extends Api
         //楼
         $floor_info = Db::name('topic_dongtai_answer')
             ->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
+            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status')
             ->join('user','a.user_id = user.id','LEFT')
             ->where(['a.id'=>$answer_id])->find();
         if(empty($floor_info)){
@@ -804,7 +791,7 @@ class Topicdongtai extends Api
         //层
         $floors = $floor_info['floor'];
         $child_lists = Db::name('topic_dongtai_answer')->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
+            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status')
             ->join('user','a.user_id = user.id','LEFT')
             ->where(['a.dt_id'=>$floor_info['dt_id'],'a.floor'=>$floors,'a.level'=>2])->order('a.id desc')->autopage()->select();
         $child_lists = list_domain_image($child_lists,['avatar','to_avatar']);
@@ -893,7 +880,7 @@ class Topicdongtai extends Api
         $list = Db::name('topic_dongtai_answer')->alias('a')
             ->field('a.id,a.createtime,a.content,a.dt_id,
             dt.images,dt.content as dt_content,dt.type as dt_type,dtuser.nickname as dtuser_nickname,dtuser.username as dtuser_username,user.username,
-            user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime')
             ->join('topic_dongtai dt','a.dt_id = dt.id','LEFT')
             ->join('user dtuser','dt.user_id = dtuser.id','LEFT')
             ->join('user user','a.user_id = user.id','LEFT')
@@ -964,7 +951,7 @@ class Topicdongtai extends Api
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->join('topic_dongtai_good good','dt.id = good.dt_id','LEFT')
-            ->field('dt.*,dt.id as dt_id,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,dt.id as dt_id,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,uw.vip_endtime')
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);

application/api/controller/User.php

@@ -333,7 +333,7 @@ class User extends Api
      */
     public function profile()
     {
-        $field_array = ['nickname','introcode','gender','birthday','attribute','shoesize','height','weight','bio','avatar','photo_images','tag_ids','hide_is_finishinfo'];
+        $field_array = ['nickname','introcode','gender','birthday','height','weight','bio','avatar','photo_images','tag_ids','hide_is_finishinfo'];
 
         $data = [];
         foreach($field_array as $key => $field){

application/api/controller/Userblack.php

@@ -18,7 +18,7 @@ class Userblack extends Api
             ->alias('black')
             ->join('user','black.uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('black.black_uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -45,7 +45,7 @@ class Userblack extends Api
             ->alias('black')
             ->join('user','black.black_uid = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
+            ->field('user.id,user.username,user.nickname,user.avatar,user.bio,user.birthday,user.gender,uw.vip_endtime')
             ->where('black.uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);