diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js index 7fccf62..a658db0 100644 --- a/fangija-zsyf/js/login/codeSms.js +++ b/fangija-zsyf/js/login/codeSms.js @@ -75,10 +75,18 @@ $("#login_btn").on("click", function () { var resData = response.data; if (resData.status) { // 用户登录成功的TOKEN - var token = resData.data; - localStorage.setItem("user_token", token); + var data = resData.data; + localStorage.setItem("user_token", data.token); $.toast(resData.message); - back(); + if (data.firstLogin) { + // 显示设置密码页面 + clicked('../user/updatePass.html',true,false,{},{},function(){ + back(); + }) + } else { + back(); + } + } else { $.toast(resData.message); } diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js index 9f94671..689d42b 100644 --- a/fangija-zsyf/js/login/thirdLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -48,74 +48,48 @@ 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 openid = a.authResult.openid; + var nickname = a.userInfo.name||a.userInfo.screen_name; + var openid = a.authResult.uid; 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 headImg = a.userInfo.headimgurl; + var uid = a.authResult.uid; + var unionid = ""; + login(openid, unionid, accessToken, nickname, headImg, "sinaweibo", "/rest/user/sinaweiboLogin") } },function(e){ - $.toast("获取微信用户信息失败:["+e.code+"]:"+e.message); + $.toast("获取用户信息失败:["+e.code+"]:"+e.message); }); } -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/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index df2421b..be88acb 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -222,7 +222,7 @@ function numberConver(thumbsUpCount){ function isCollect(){ axios.post("/rest/news/checkCollect",{newsId : id}).then(function (response) { - var msg = response.data.data + var msg = response.data.data; if(msg){ $(".collection").addClass("collection02") $(".collection i").addClass("icon-collection02") @@ -491,8 +491,9 @@ $(".praise").on("click", function () { //收藏 $(".collection").on("click", function () { - //doCollect(); - collect(); + //localStorage.removeItem("user_token"); + doCollect(); + //collect(); }); function doCollect() { if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { 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 @@