diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index a126994..f20f0c4 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -var BASE_PATH = "http://192.168.10.161:8084"; +//var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; -//var BASE_PATH = "http://192.168.10.170:8084"; +var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/login/wxLogin.js b/fangija-zsyf/js/login/thirdLogin.js similarity index 51% rename from fangija-zsyf/js/login/wxLogin.js rename to fangija-zsyf/js/login/thirdLogin.js index 64ae6cd..6458c6f 100644 --- a/fangija-zsyf/js/login/wxLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -48,14 +48,21 @@ 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) + wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin") }else if(a.id=='qq'){ var nickname=a.userInfo.nickname; var openid = a.authResult.openid; var accessToken = a.authResult.access_token; - var headImg = a.userInfo.headimgurl; + var headImg = a.userInfo.headimgurl; + qqLogin(openid,accessToken,nickname,headImg,"qq") }else{ //微博信息获取 + 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") } },function(e){ @@ -63,14 +70,49 @@ function userinfo(a){ }); } -function wxlogin(openid, unionid, accessToken, nickname, headImg) { - axios.post("/rest/user/wxLogin", {openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) +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}) .then(function (response) { $.hidePreloader(); if(response.data.status){ - console.log(JSON.stringify(response.data)) - //跳转页面 - + if("no"==response.data.message){ + //跳转绑定手机号码页面 + + }else{ + + } + }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) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index e9cc7b5..aacae88 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -317,7 +317,7 @@ "weixin": { "appid": "wx734a9e3085abcd90", "appsecret": "47ce59f3c52984c4e193880fb09b12af" - },"qq":{"appid":"1106734669"} + },"qq":{"appid":"1106734669"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com"} } }, "debug": true diff --git a/fangija-zsyf/views/user/codeSms.html b/fangija-zsyf/views/user/codeSms.html index 74e1cdf..2ff37d3 100644 --- a/fangija-zsyf/views/user/codeSms.html +++ b/fangija-zsyf/views/user/codeSms.html @@ -97,7 +97,7 @@ $.config = {router: false} - +