Commit 2a3cae37 by 冷斌

fix bug

parent 6d152eea
...@@ -46,6 +46,11 @@ class PassportAction extends CommonAction ...@@ -46,6 +46,11 @@ class PassportAction extends CommonAction
$this->login(); $this->login();
} }
public function wxLogin($openid)
{
}
/** /**
* 登录页 * 登录页
* @return void * @return void
...@@ -98,9 +103,8 @@ class PassportAction extends CommonAction ...@@ -98,9 +103,8 @@ class PassportAction extends CommonAction
$appSecret = $pageKeyData['mp_api_secret']; $appSecret = $pageKeyData['mp_api_secret'];
$url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=$appId&secret=$appSecret&code=$code&grant_type=authorization_code"; $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=$appId&secret=$appSecret&code=$code&grant_type=authorization_code";
$res = $this->sendRequest($url); $res = $this->sendRequest($url);
var_dump($res); $openid = $res['openid'];
$openId = $res['openid']; $this->wxLogin($openid);
die;
} }
} }
...@@ -145,7 +149,8 @@ class PassportAction extends CommonAction ...@@ -145,7 +149,8 @@ class PassportAction extends CommonAction
$login = addslashes($_POST['login_email']); $login = addslashes($_POST['login_email']);
$password = trim($_POST['login_password']); $password = trim($_POST['login_password']);
$remember = intval($_POST['login_remember']); $remember = intval($_POST['login_remember']);
$result = $this->passport->loginLocal($login, $password, $remember); $openid = $_POST['openid'];
$result = $this->passport->loginLocal($login, $password, $remember, true);
if (!$result) { if (!$result) {
$status = 0; $status = 0;
$info = $this->passport->getError(); $info = $this->passport->getError();
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
return; return;
} }
$.post(U('basic/Passport/doLogin'), { login_email: phone, login_password: pwd }, function(data) { $.post(U('basic/Passport/doLogin'), { login_email: phone, login_password: pwd, openid: "{$openid}" }, function(data) {
if (data.status == 1) { if (data.status == 1) {
ui.success('登录成功') ui.success('登录成功')
var reurl = "{$reurl}" var reurl = "{$reurl}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment