拉黑和用户注册

application/api/controller/Userblack.php

@@ -17,11 +17,24 @@ class Userblack extends Api
         $list = Db::name('user_black')
             ->alias('black')
             ->join('user','black.uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender,user.attribute,uw.vip_endtime')
             ->where('black.black_uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
-        $list = list_birthday_age($list);
+
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+
+                //用户年龄
+                $val['age'] = birthtime_to_age($val['birthday']);
+                unset($val['birthday']);
+
+                //用户vip
+                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                unset($val['vip_endtime']);
+            }
+        }
 
         $this->success('success',$list);
     }
@@ -31,11 +44,24 @@ class Userblack extends Api
         $list = Db::name('user_black')
             ->alias('black')
             ->join('user','black.black_uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->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')
             ->where('black.uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
-        $list = list_birthday_age($list);
+
+        if(!empty($list)){
+            foreach($list as $key => &$val){
+
+                //用户年龄
+                $val['age'] = birthtime_to_age($val['birthday']);
+                unset($val['birthday']);
+
+                //用户vip
+                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                unset($val['vip_endtime']);
+            }
+        }
 
         $this->success('success',$list);
     }

application/common/library/Auth.php

@@ -330,14 +330,6 @@ class Auth
             //注册用户活跃
             Db::name('user_active')->insertGetId(['user_id'=>$user->id]);
 
-            //加入id 1,2,3 的圈子
-            $topic_data = [
-                ['user_id'=>$user->id,'topic_id'=>1],
-                ['user_id'=>$user->id,'topic_id'=>2],
-                ['user_id'=>$user->id,'topic_id'=>3],
-            ];
-            Db::name('topic_user')->insertAll($topic_data);
-
             //注册成功的事件
             Hook::listen("user_register_successed", $this->_user, $data);
             Db::commit();