|
|
@@ -61,6 +61,11 @@ class LoginLogic extends BaseLogic
|
|
|
'channel' => $params['channel'],
|
|
|
]);
|
|
|
|
|
|
+ //验证是否传微信小程序的CODE,如果传入进行绑定
|
|
|
+ if(!empty($params['code']) and $params['channel']==1){
|
|
|
+ self::mnpLogin($params);
|
|
|
+ }
|
|
|
+
|
|
|
return true;
|
|
|
} catch (\Exception $e) {
|
|
|
self::setError($e->getMessage());
|
|
|
@@ -103,6 +108,11 @@ class LoginLogic extends BaseLogic
|
|
|
$avatar = $user->avatar ?: Config::get('project.default_image.user_avatar');
|
|
|
$avatar = FileService::getFileUrl($avatar);
|
|
|
|
|
|
+ //验证是否传微信小程序的CODE,如果传入进行绑定
|
|
|
+ if(!empty($params['code']) and $params['terminal']==1){
|
|
|
+ self::mnpLogin($params);
|
|
|
+ }
|
|
|
+
|
|
|
return [
|
|
|
'nickname' => $userInfo['nickname'],
|
|
|
'sn' => $userInfo['sn'],
|