合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !614

@@ -18,7 +18,7 @@ class FriendController extends HomeBaseController
     public function friendGiveLog()
     {
         $data = Db::name('friendship')->alias('f')
-            ->field('f.total,u.user_nickname,u.avatar')
+            ->field('f.friend_uid as friend_id,f.total,u.user_nickname,u.avatar')
             ->join('user u', 'u.id=f.friend_uid')
             ->where(['f.uid' => session('user.id')])
             ->select()->toArray();
@@ -43,7 +43,6 @@ class FriendController extends HomeBaseController
             ->field('id as friend_id,avatar,user_nickname')
             ->where($where)
             ->select()->toArray();
-        print_r($list);
         if (!empty($list)) {
             return $this->fetch(':friend_list', [
                 'keyword' => $keyword,