|
...
|
...
|
@@ -195,13 +195,10 @@ class Wechat extends Api |
|
|
|
$this->error($e->getMessage());
|
|
|
|
}
|
|
|
|
if($user_id !=0){
|
|
|
|
<<<<<<< HEAD
|
|
|
|
$this->success('完成',$user_id);
|
|
|
|
=======
|
|
|
|
|
|
|
|
$data['token'] = $this->auth->getToken();
|
|
|
|
$data['user_info'] = $user;
|
|
|
|
$this->success('完成',$data);
|
|
|
|
>>>>>>> 0dba521a562d536413694ddd919d77475f2e2ee8
|
|
|
|
}else{
|
|
|
|
$this->error('code处理失败');
|
|
|
|
}
|
...
|
...
|
|
