youfang1.0.3 代码冲突

This commit is contained in:
zongzhimin
2018-04-23 10:43:58 +08:00
parent 1c948d539c
commit 7302c16ae0
8 changed files with 38 additions and 17 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
axios.defaults.timeout = 15000;
axios.defaults.timeout = 120000;
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
+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);
+17 -9
View File
@@ -1546,6 +1546,9 @@ function initNews(page){
}
})
.then(function (response) {
if(page == 1){
dataObj = []
}
//合并数组
if(response.data.data.list.length == 0){
//隐藏加载框
@@ -2226,13 +2229,6 @@ function changeCity(cityStr){
city = cityStr
console.log(oriCity + "==" + cityStr)
if(oriCity== cityStr){
if(oriRegion!=""){
//$("#region").text(oriRegion);
setTimeout(function(){
baseInfo.region = oriRegion;
},1000)
}
lat = oriLat;
lng = oriLng;
if(cityStr=="上海"){
@@ -2271,7 +2267,7 @@ function changeCity(cityStr){
$("#ShangHaiDiv").show();
$("#otherCityDiv").hide();
//initNearDistricts($(this).text(),0,0,"",0,0,0,"");
initBaseInfo(cityStr,"",address,lat,lng);
//initBaseInfo(cityStr,oriRegion,address,lat,lng);
}else{
$("#ShangHaiDiv").hide();
$("#otherCityDiv").show();
@@ -2288,9 +2284,21 @@ function changeCity(cityStr){
//加载列表
sort=6;
getDistrictList(cityStr,lat,lng,"",sort,0,0,"");
initBaseInfo(cityStr,"","",0,0);
}
if(oriCity== cityStr){
if(oriRegion!=""){
setTimeout(function(){
//alert(oriRegion)
baseInfo.region = oriRegion;
//changeRegion();
},1000)
}
initBaseInfo(cityStr,oriRegion,"",0,0);
}else{
initBaseInfo(cityStr,"","",0,0);
}
$(".selectContent").hide();
//刷新下拉滚动加载事件
$.attachInfiniteScroll($('.infinite-scroll'))