作者 xwp

登录逻辑修改

@@ -153,19 +153,18 @@ class User extends Api @@ -153,19 +153,18 @@ class User extends Api
153 $user = $user->where(['openid'=>$openid,'is_default'=>true])->find(); 153 $user = $user->where(['openid'=>$openid,'is_default'=>true])->find();
154 if ($user) { 154 if ($user) {
155 //如果已经有账号则直接登录 155 //如果已经有账号则直接登录
156 - $ret = $this->auth->direct($user->id); 156 + $this->auth->direct($user->id);
  157 + $return['user_info'] = $this->auth->getUserinfo();
157 } else { 158 } else {
158 - $user = new \app\admin\model\User;  
159 - $user = $user->where(['openid'=>$openid])->find();  
160 - if(empty($user)){  
161 - $ret = $this->register($openid,empty($mobile)?'':$mobile); 159 + if(!empty($mobile)){
  160 + $this->register($openid,empty($mobile)?'':$mobile);
  161 + $return['user_info'] = $this->auth->getUserinfo();
  162 + }else{
  163 + $return['user_info'] = [];
162 } 164 }
163 } 165 }
164 - if (!$ret) {  
165 - $this->error($this->auth->getError());  
166 - }  
167 166
168 - $return['user_info'] = $this->auth->getUserinfo(); 167 +
169 $return['session'] = $session; 168 $return['session'] = $session;
170 169
171 $this->success('Logged in successful', $return); 170 $this->success('Logged in successful', $return);