修改 bug

niucloud/app/api/controller/apiController/CustomerResources.php

@@ -31,10 +31,6 @@ class CustomerResources extends BaseApiService
 
         $name = $request->param('name', '');//客户姓名
         $phone_number = $request->param('phone_number', '');//客户手机号
-        if (empty($name) && empty($phone_number)) {
-            return fail("缺少查询参数");
-        }
-
         $where = [
             'name' => $name,
             'phone_number' => $phone_number

niucloud/app/service/api/login/UnifiedLoginService.php

@@ -246,26 +246,15 @@ class UnifiedLoginService extends BaseService
             $customerInfo->login_time = time();
             $customerInfo->save();
         }
-
-        // 查找关联的会员信息
-        $member = new Member();
-        $memberInfo = null;
-        if ($customerInfo['member_id']) {
-            $memberInfo = $member->where('member_id', $customerInfo['member_id'])->find();
-        }
-
-        // 如果没有关联的会员信息，使用客户信息
-        $userId = $memberInfo ? $memberInfo['member_id'] : $customerInfo['id'];
         $userType = self::USER_TYPE_MEMBER;
 
         // 生成Token
         $tokenData = [
-            'user_id' => $userId,
+            'user_id' => $customerInfo['id'],
-            'user_type' => $userType,
+            'user_type' => $userType
-            'site_id' => $memberInfo['site_id'] ?? 0,
         ];
 
-        $tokenResult = TokenAuth::createToken($userId, AppTypeDict::API, $tokenData, 86400);
+        $tokenResult = TokenAuth::createToken($customerInfo['id'], AppTypeDict::API, $tokenData, 86400);
         $token = $tokenResult['token'];
 
         // 获取会员菜单权限
@@ -274,11 +263,10 @@ class UnifiedLoginService extends BaseService
         return [
             'token' => $token,
             'user_info' => [
-                'id' => $userId,
+                'id' => $customerInfo['id'],
-                'username' => $memberInfo ? $memberInfo['username'] : $customerInfo['name'],
+                'username' => $customerInfo['name'],
-                'nickname' => $memberInfo ? $memberInfo['nickname'] : $customerInfo['name'],
+                'nickname' => $customerInfo['name'],
                 'mobile' => $customerInfo['phone_number'],
-                'avatar' => $memberInfo ? ($memberInfo['headimg'] ?? '') : '',
                 'user_type' => $userType,
                 'customer_id' => $customerInfo['id'],
                 'name' => $customerInfo['name'],

niucloud/app/service/api/student/StudentService.php

@@ -32,7 +32,6 @@ class StudentService extends BaseService
         if (!$customerResource) {
             throw new CommonException('用户信息不存在');
         }
-
         // 获取该用户的所有学员
         $studentList = (new Student())
             ->where('user_id', $customerId)