合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !629

@@ -83,6 +83,10 @@ class FriendController extends HomeBaseController
                     exit();
                     exit();
                 } else {
                 } else {
                     $parent_id = ($info['role'] == 2) ? $uid : $info['parent_id'];
                     $parent_id = ($info['role'] == 2) ? $uid : $info['parent_id'];
+                    //如果只是单纯加好友，则不绑定
+                    if($total == 0) {
+                        $parent_id = null;
+                    }
                     $tag = true;
                     $tag = true;
                     $friend_id = $request->param('friend_id');
                     $friend_id = $request->param('friend_id');
                     $friend_parent_id = Db::name('user')->where(['id' => $friend_id])->value('parent_id');
                     $friend_parent_id = Db::name('user')->where(['id' => $friend_id])->value('parent_id');