fix bug

apps/basic/Lib/Action/PassportAction.class.php

@@ -46,6 +46,11 @@ class PassportAction extends CommonAction
         $this->login();
     }
 
+    public function wxLogin($openid)
+    {
+
+    }
+
     /**
      * 登录页
      * @return void
@@ -98,9 +103,8 @@ class PassportAction extends CommonAction
                 $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";
                 $res = $this->sendRequest($url);
-                var_dump($res);
-                $openId  = $res['openid'];
-                die;
+                $openid  = $res['openid'];
+                $this->wxLogin($openid);
             }
         }
 
@@ -145,7 +149,8 @@ class PassportAction extends CommonAction
         $login    = addslashes($_POST['login_email']);
         $password = trim($_POST['login_password']);
         $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) {
             $status = 0;
             $info   = $this->passport->getError();

apps/basic/Tpl/default/Passport/login_w3g.html

@@ -101,7 +101,7 @@
 					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) {
 						ui.success('登录成功')
 						var reurl = "{$reurl}"