问答，关注

application/api/controller/Baseconfig.php

@@ -108,6 +108,11 @@ class Baseconfig extends Api
         $this->success('success',$config);
     }
 
+    //帮助中心
+    public function questions(){
+        $list = Db::name('questions')->order('weigh desc')->select();
+        $this->success(1,$list);
+    }
 
 
 }

application/api/controller/Greet.php

@@ -95,7 +95,7 @@ class Greet extends Api
 
     //首页一键搭讪
     public function onekey_greet(){
-        
+
     }
 
 

application/api/controller/Userfollow.php

@@ -19,13 +19,11 @@ class Userfollow extends Api
             $user_id = $this->auth->id;
         }
 
-
         //列表
         $list = Db::name('user_follow')
             ->alias('follow')
             ->join('user','follow.follow_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.birthday,user.gender')
             ->where('follow.uid',$user_id)->order('follow.id desc')->group('follow.follow_uid')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -36,9 +34,7 @@ class Userfollow extends Api
 
         if(!empty($list)){
             foreach($list as $key => &$val){
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
+
                 //是否关注
                 $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
             }
@@ -54,13 +50,11 @@ class Userfollow extends Api
             $user_id = $this->auth->id;
         }
 
-
         //列表
         $list = Db::name('user_follow')
             ->alias('follow')
             ->join('user','follow.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.birthday,user.gender')
             ->where('follow.follow_uid',$user_id)
             ->group('follow.uid')
             ->order('follow.id desc')->autopage()->select();
@@ -73,9 +67,7 @@ class Userfollow extends Api
 
         if(!empty($list)){
             foreach($list as $key => &$val){
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
+
                 //是否关注
                 $val['is_follow'] = in_array($val['id'],$my_follow_uids) ? 1 : 0;
             }
@@ -162,16 +154,8 @@ class Userfollow extends Api
             $this->success('操作成功');
         }
 
-        Db::startTrans();
         $id = Db::name('user_follow')->insertGetId($map);
-        if(!$id){
-            Db::rollback();
-            $this->error('关注失败');
-        }
-
-
 
-        Db::commit();
         $this->success('操作成功',$id);
     }