Wesmiler

app/Services/Api/MemberService.php

@@ -201,7 +201,7 @@ class MemberService extends BaseService
         $code = isset($params['code'])? $params['code'] : '';
         $avatar = isset($params['avatar'])? $params['avatar'] : '';
         $nickname = isset($params['nickname'])? $params['nickname'] : '';
-        if($id<=0 || empty($code)){
+        if($id<=0){
             $this->error = '授权参数错误，请刷新重试';
             return false;
         }
@@ -212,23 +212,32 @@ class MemberService extends BaseService
         }
 
         $userInfo = $this->model->where(['id'=>$id,'mark'=>1])
-            ->select(['id as uid', 'nickname', 'openid','avatar'])
+            ->select(['id as uid', 'nickname','mobile', 'openid','avatar'])
             ->first();
+        $phone = isset($userInfo['mobile'])? $userInfo['mobile'] : '';
         if(empty($userInfo)){
             $this->error = '授权登录失败，请刷新重试';
             return false;
         }
 
+        if(empty($phone) && empty($code)){
+            $this->error = '请先刷新重试，授权获取手机号';
+            return false;
+        }
+
         // 获取手机号信息
-        $phoneData = MpService::make()->getPhoneNumber($code);
-        $phoneData = isset($phoneData['phone_info']) ? $phoneData['phone_info'] : [];
-        $phone = isset($phoneData['phoneNumber']) ? $phoneData['phoneNumber'] : '';
+        if($code){
+            $phoneData = MpService::make()->getPhoneNumber($code);
+            $phoneData = isset($phoneData['phone_info']) ? $phoneData['phone_info'] : [];
+            $phone = isset($phoneData['phoneNumber']) ? $phoneData['phoneNumber'] : '';
 
-        if (empty($phone)) {
-            $this->error = MpService::make()->getError();
-            return false;
+            if (empty($phone)) {
+                $this->error = MpService::make()->getError();
+                return false;
+            }
         }
 
+
         $avatar = save_base64_image($avatar, 'avatar');
         if(!$this->model->where(['id'=>$id])->update(['mobile'=>$phone,'nickname'=>$nickname,'avatar'=>$avatar,'update_time'=>time()])){
             $this->error = '获取授权信息失败';