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

This commit is contained in:
xuhe@fangjia.com
2018-04-20 22:22:28 +08:00
7 changed files with 23 additions and 7 deletions
+8 -3
View File
@@ -12,6 +12,9 @@ var mapLoadCount = 0;
function doAddCollect(){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
doAddCollect();
})
return;
@@ -29,10 +32,9 @@ function addCollect(){
$(".collection01").hide();
$(".collection02").show();
$.toast("随时掌握小区动态");
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -47,6 +49,7 @@ function doRemoveCollect(){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
doRemoveCollect();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
})
return;
} else {
@@ -311,6 +314,8 @@ function showTrends(v){
clicked('../user/codeSms.html',true,false,{},{},function(){
showTrends(v);
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
return;
} else {
+4
View File
@@ -198,6 +198,9 @@ function clickTrend(city, type){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
clickTrend(city, type);
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
return;
} else {
@@ -542,6 +545,7 @@ function collectCity(city, type){
collectCity(city, type)
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
})
return;
} else {
@@ -50,7 +50,7 @@ Vue.component('city_increase_ranking',{
follow:function(city,event, type){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
clicked('/views/user/passLogin.html',true,false,{},{},function(){
clicked('/views/user/codeSms.html',true,false,{},{},function(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
}else{
$.confirm('您确定要关注'+city+"?", function () {
+3 -1
View File
@@ -1845,7 +1845,9 @@ function checkIsLogin(){
}else{
addEvaluation();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}
})
}else{
@@ -1280,7 +1280,6 @@ $.config = {router: false}
loadMyCollectCity();
}, function(e){
loadAllCityData();
loadMyCollectCity();
},
+4 -1
View File
@@ -504,6 +504,9 @@ $(".collection").on("click", function () {
function doCollect() {
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload()
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
doCollect();
})
return;
@@ -533,7 +536,7 @@ function collect(){
$(".collection").removeClass("collection02")
$(".collection i").removeClass("icon-collection02")
}
plus.webview.getWebviewById('views/user/userInfo.html').reload()
}
$.toast(msg);
+3
View File
@@ -1546,6 +1546,9 @@ function initNews(page){
}
})
.then(function (response) {
if(page == 1){
dataObj = []
}
//合并数组
if(response.data.data.list.length == 0){
//隐藏加载框