From 7c37b035b0e9f17ac3effe3a530c0269b262f12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Sun, 8 Apr 2018 11:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=94=B6=E8=97=8F=E6=95=B4?= =?UTF-8?q?=E5=90=88=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/login/codeSms.js | 14 +++++++++++--- fangija-zsyf/views/news/newsDetail.html | 5 +++-- fangija-zsyf/views/user/passLogin.html | 1 + fangija-zsyf/views/user/updatePass.html | 6 ++++-- 4 files changed, 19 insertions(+), 7 deletions(-) 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} +