|
|
@@ -90,7 +90,8 @@ class LoginController extends BaseApiController
|
|
|
if (false === $result) {
|
|
|
return $this->fail(LoginLogic::getError());
|
|
|
}
|
|
|
- if(!empty($params['wx_code']) and $params['terminal']==1){
|
|
|
+ //if(!empty($params['wx_code']) and $params['terminal']==1){
|
|
|
+ if(!empty($params['wx_code'])){
|
|
|
$params['code'] = $params['wx_code'];
|
|
|
$params['user_id'] = MasterWorker::where('sn',$result['sn'])->value('id');
|
|
|
$wx_result = LoginLogic::mnpAuthLogin($params);
|