From e26aa7ac7f45f1c9d7cb68882b386290d55d36f3 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 13 Apr 2018 18:26:36 +0800 Subject: [PATCH] update --- fangija-zsyf/js/district/districtDetail.js | 14 ++++++- fangija-zsyf/js/quotations/collectCity.js | 16 +++++++- fangija-zsyf/manifest.json | 17 ++++++-- fangija-zsyf/views/component/nearDist.js | 2 +- fangija-zsyf/views/district/detail.html | 2 +- fangija-zsyf/views/house/houseDetail.html | 3 +- fangija-zsyf/views/rent/rent.html | 47 +++++++++++++--------- fangija-zsyf/views/setting/setting.html | 1 + 8 files changed, 72 insertions(+), 30 deletions(-) diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 528ea5f..4e8378f 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -5,6 +5,7 @@ var dates; var data; var volumes; var curOption; +var mapLoadCount = 0; /* 关注&已关注切换 */ @@ -89,11 +90,20 @@ $("#tabRentDiv").on("click", function () { $("#tabChart1").css("z-index","-1"); }); -var t1 = window.setTimeout(loadMap,1000); +var t1 = window.setInterval(loadMap,1000); function loadMap(){ + mapLoadCount++; if(lng && lat){ loadMapPoi(); - window.clearTimeout(t1); + $("#mapDiv").show(); + window.clearInterval(t1); + }else{ + if(mapLoadCount == 10){ + $("#mapDiv").hide(); + window.clearInterval(t1); + }else{ + $("#mapDiv").hide(); + } } } diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index bef734b..1e51f55 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -530,7 +530,11 @@ function showRegionInfo(city){ function collectCity(city, index){ 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(); collectCity(city) + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + }) return; } else { @@ -571,12 +575,20 @@ function docollectCity(city){ } } if(isLast){ - window.location.reload(); + //window.location.reload(); + $("a[href='#tabQuotation0']").click(); } myDatasVue.$data.cityDatas = newRet1; citysVue.$data.citys = newRet2 }else{ - alert(msg); + var datas = myDatasVue.$data.cityDatas + for(var i in datas){ + var obj = datas[i] + if(obj.city == city){ + obj.colled = true; + } + } + } } diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 8ed8840..6bbd6c7 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1568,7 +1568,9 @@ "resources": [ "/views/user/bindingMobile.html" ], - "refer": [], + "refer": [ + "views/user/passLogin.html" + ], "priority": 0 }, "views/district/detail.html": { @@ -1617,7 +1619,8 @@ "refer": [ "views/user/passLogin.html", "views/district/detail.html", - "views/setting/setting.html" + "views/setting/setting.html", + "views/user/codeSms.html" ], "priority": 0 }, @@ -1670,7 +1673,15 @@ "views/house/regions.html", "views/district/detail.html", "views/user/codeSms.html", - "views/house/cityDetail.html" + "views/house/cityDetail.html", + "views/user/passLogin.html" + ], + "priority": 0 + }, + "views/house/houseManageList.html": { + "resources": [], + "refer": [ + "views/house/add.html" ], "priority": 0 } diff --git a/fangija-zsyf/views/component/nearDist.js b/fangija-zsyf/views/component/nearDist.js index 99b2532..a955c91 100644 --- a/fangija-zsyf/views/component/nearDist.js +++ b/fangija-zsyf/views/component/nearDist.js @@ -65,7 +65,7 @@ Vue.component('near-dist-component', { }); }, showDistrict:function(index){ - clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].region,name:distDatas.nearDists[index].name}); + clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].district,name:distDatas.nearDists[index].name}); } }, mounted:function(){ diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 38d2322..562d89e 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -165,7 +165,7 @@ -
+
位置及周边
-
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
+
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
+
暂无
-
+
位置及周边