赠送积分和角色管理

@@ -18,8 +18,8 @@ class FriendController extends HomeBaseController
     public function friendGiveLog()
     public function friendGiveLog()
     {
     {
         $data = Db::name('friendship')->alias('f')
         $data = Db::name('friendship')->alias('f')
-            ->field('f.total,u.user_nickname,avatar')
-            ->join('user u', 'u.id=f.friend_id')
+            ->field('f.total,u.user_nickname,u.avatar')
+            ->join('user u', 'u.id=f.friend_uid')
             ->where(['f.uid' => session('user.id')])
             ->where(['f.uid' => session('user.id')])
             ->select()->toArray();
             ->select()->toArray();
         return $this->fetch(':friend_give_log', [
         return $this->fetch(':friend_give_log', [