diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js index 9f94671..fb8e2f4 100644 --- a/fangija-zsyf/js/login/thirdLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -48,21 +48,23 @@ function userinfo(a){ var accessToken = a.authResult.access_token; var unionid = a.userInfo.unionid; var headImg = a.userInfo.headimgurl; - wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin") + login(openid, unionid, accessToken, nickname, headImg, "weixin", "/rest/user/wxLogin") }else if(a.id=='qq'){ - var nickname=a.userInfo.nickname; + var nickname= a.userInfo.nickname; var openid = a.authResult.openid; var accessToken = a.authResult.access_token; var headImg = a.userInfo.headimgurl; - qqLogin(openid,accessToken,nickname,headImg,"qq") + var unionid = ""; + login(openid, unionid, accessToken, nickname, headImg, "qq", "/rest/user/qqLogin") }else{ //微博信息获取 - var nickname=a.userInfo.name||a.userInfo.screen_name; + var nickname = a.userInfo.name||a.userInfo.screen_name; var openid = a.authResult.openid; var accessToken = a.authResult.access_token; var headImg = a.userInfo.profile_image_url; - var uid = a.authResult.uid - weiboLogin(openid,accessToken,nickname,headImg,"sinaweibo") + var uid = a.authResult.uid; + var unionid = ""; + login(openid, unionid, accessToken, nickname, headImg, "sinaweibo", "/rest/user/sinaweiboLogin") } },function(e){ @@ -70,52 +72,24 @@ function userinfo(a){ }); } -function wxLogin(openid, unionid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/wxLogin", {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) +function login(openid, unionid, accessToken, nickname, headImg, loginFrom, uri) { + axios.post(uri, {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) .then(function (response) { $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ + var resData = response.data; + if(resData.status){ + if(resData.data == ""){ //跳转绑定手机号码页面 - console.log(response.data.message) + clicked('../user/bindingMobile.html',true,false,{},{loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg},function(){ + back(); + }) }else{ - + localStorage.setItem("user_token", resData.data); + back(); } }else{ //登录失败 - $.toast(response.data.data) - } - }) -} -function qqLogin(openid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/qqLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) - .then(function (response) { - $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ - //跳转绑定手机号码页面 - }else{ - - } - }else{ - //登录失败 - $.toast(response.data.data) - } - }) -} -function weiboLogin(openid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/sinaweiboLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) - .then(function (response) { - $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ - //跳转绑定手机号码页面 - }else{ - - } - }else{ - //登录失败 - $.toast(response.data.data) + $.toast(resData.message) } }) } diff --git a/fangija-zsyf/views/user/bindingMobile.html b/fangija-zsyf/views/user/bindingMobile.html index 4976692..5772d0b 100644 --- a/fangija-zsyf/views/user/bindingMobile.html +++ b/fangija-zsyf/views/user/bindingMobile.html @@ -22,7 +22,7 @@
-

绑定账号

@@ -85,6 +85,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index d55e6ad..e531a95 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -94,7 +94,7 @@ $.config = {router: false} - +