Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
2018-03-30 16:32:31 +08:00
4 changed files with 15 additions and 7 deletions
+1
View File
@@ -78,6 +78,7 @@ $("#login_btn").on("click", function () {
var token = resData.data;
localStorage.setItem("user_token", token);
$.toast(resData.message);
back();
} else {
$.toast(resData.message);
}
+12 -1
View File
@@ -473,10 +473,21 @@ $(".praise").on("click", function () {
//收藏
$(".collection").on("click", function () {
//doCollect();
collect();
});
function doCollect() {
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
doCollect();
})
return;
} else {
collect();
}
}
function collect(){
axios.post("/rest/news/collect",{newsId : id}).then(function (response) {
var msg = response.data.message
+1 -1
View File
@@ -64,7 +64,7 @@
</p>
<div class="content-block loginBox">
<p><a class="button button-big button-fill theme" id="login_btn">登录</a></p>
<p><a onclick="clicked('passLogin.html', true)">账号密码登录</a></p>
<p><a href="passLogin.html">账号密码登录</a></p>
</div>
<div class="content-block loginMode">
<p class="line">
+1 -5
View File
@@ -59,7 +59,7 @@
</div>
<div class="content-block loginBox">
<p><a class="button button-big button-fill theme" id="login_btn" @click="passLogin">登录</a></p>
<p><a @click="openSmsLoginPage">快捷登录</a></p>
<p><a href="codeSms.html">快捷登录</a></p>
</div>
<div class="content-block loginMode">
<p class="line">
@@ -151,10 +151,6 @@ new Vue({
$(".list-block .item-after .icon-eye-orange").hide();
$(".list-block .item-after .icon-eye-grey").show();
$("#input_password").attr("type","password");
},
// 打开验证码登录页面
openSmsLoginPage: function() {
back(),plus.nativeUI.closeWaiting();
}
}
});