commit

app/api/controller/wechat/AuthController.php

@@ -66,8 +66,8 @@ class AuthController
         ]);//获取前台传的code
         try {
             //解密获取用户信息
-            $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
-            $userPhone = MiniProgramService::encryptor($session_key, $data['iv1'], $data['encryptedData1']);
+//            $userInfo = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
+            $userPhone = MiniProgramService::encryptor($session_key, $data['iv'], $data['encryptedData']);
         } catch (\Exception $e) {
             if ($e->getCode() == '-41003') return app('json')->fail('获取会话密匙失败');
         }

app/models/user/WechatUser.php

@@ -79,14 +79,14 @@ class WechatUser extends BaseModel
      */
     public static function routineOauth($routine)
     {
-        $routineInfo['nickname'] = filter_emoji($routine['nickName']);//姓名
-        $routineInfo['phone'] = $routine['phone'];//姓名
-        $routineInfo['sex'] = $routine['gender'];//性别
-        $routineInfo['language'] = $routine['language'];//语言
-        $routineInfo['city'] = $routine['city'];//城市
-        $routineInfo['province'] = $routine['province'];//省份
-        $routineInfo['country'] = $routine['country'];//国家
-        $routineInfo['headimgurl'] = $routine['avatarUrl'];//头像
+        $routineInfo['nickname'] = isset($routine['nickName']) ? filter_emoji($routine['nickName']) : '';//姓名
+        $routineInfo['phone'] = isset( $routine['phone']) ?  $routine['phone'] : '';//姓名
+        $routineInfo['sex'] = isset($routine['gender']) ? $routine['gender'] : 0;//性别
+        $routineInfo['language'] = isset($routine['language']) ? $routine['language'] : '';//语言
+        $routineInfo['city'] = isset($routine['city']) ? $routine['city'] : '';//城市
+        $routineInfo['province'] = isset($routine['province']) ? $routine['province'] : '';//省份
+        $routineInfo['country'] = isset($routine['country']) ?  $routine['country'] : '';//国家
+        $routineInfo['headimgurl'] = isset($routine['avatarUrl']) ? $routine['avatarUrl'] : '';//头像
         $routineInfo['routine_openid'] = $routine['openId'];//openid
         $routineInfo['session_key'] = $routine['session_key'];//会话密匙
         $routineInfo['unionid'] = $routine['unionId'];//用户在开放平台的唯一标识符