|
|
@@ -16,6 +16,7 @@ namespace app\api\controller;
|
|
|
|
|
|
use app\common\enum\LoginEnum;
|
|
|
use app\common\enum\user\UserTerminalEnum;
|
|
|
+use app\common\model\user\User;
|
|
|
use app\api\validate\{LoginAccountValidate, RegisterValidate, WebScanLoginValidate, WechatLoginValidate};
|
|
|
use app\api\logic\LoginLogic;
|
|
|
|
|
|
@@ -43,7 +44,7 @@ class LoginController extends BaseApiController
|
|
|
//验证是否传微信小程序的CODE,如果传入进行绑定
|
|
|
if(!empty($params['wx_code']) and $params['channel']==1){
|
|
|
$params['code'] = $params['wx_code'];
|
|
|
- $params['user_id'] = $this->userId;
|
|
|
+ $params['user_id'] = User::where('sn',$result['sn'])->value('id');
|
|
|
$wx_result = LoginLogic::mnpAuthLogin($params);
|
|
|
if ($wx_result === false) {
|
|
|
return $this->fail(LoginLogic::getError());
|
|
|
@@ -70,8 +71,7 @@ class LoginController extends BaseApiController
|
|
|
//验证是否传微信小程序的CODE,如果传入进行绑定
|
|
|
if(!empty($params['wx_code']) and $params['terminal']==1){
|
|
|
$params['code'] = $params['wx_code'];
|
|
|
- $params['user_id'] = $this->userId;
|
|
|
- dd($params);
|
|
|
+ $params['user_id'] = User::where('sn',$result['sn'])->value('id');
|
|
|
$wx_result = LoginLogic::mnpAuthLogin($params);
|
|
|
if ($wx_result === false) {
|
|
|
return $this->fail(LoginLogic::getError());
|