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/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index df2421b..7a6d587 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -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/passLogin.html b/fangija-zsyf/views/user/passLogin.html index 6278e5f..d55e6ad 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -132,6 +132,7 @@ new Vue({ var token = resData.data; localStorage.setItem("user_token", token); $.toast(resData.message); + back(); } else { $.toast(resData.message); } diff --git a/fangija-zsyf/views/user/updatePass.html b/fangija-zsyf/views/user/updatePass.html index 109e96c..ed87ad8 100644 --- a/fangija-zsyf/views/user/updatePass.html +++ b/fangija-zsyf/views/user/updatePass.html @@ -21,7 +21,7 @@
-

设置密码

@@ -59,7 +59,7 @@

确认

-

跳过

+

跳过

@@ -82,6 +82,7 @@ $.config = {router: false} +