diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index 41578df..0b8c69a 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -4,6 +4,9 @@ var lat = 31.222578; var lng = 121.359555; var allCity = [] var collCount = 0; +var collecteds = []; +var ret = [] + var myDatasVue = new Vue({ el: '#contentTabDiv', data: { @@ -33,9 +36,6 @@ var month = date.getMonth()+1+'月'; //loadMyCollectCity(); - - - function addUpChart(dataUp, num){ /* 小区上涨 */ //var dataUp = []; @@ -134,10 +134,8 @@ function loadMyCollectCity(){ axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) { var curDatas = response.data.data - var collecteds = []; - collCount = curDatas.length; if(curDatas){ - var ret = [] + collCount = curDatas.length; for(var i in curDatas){ var curCity = curDatas[i] if(!IsInArray(myCollectCitys, curCity)){ @@ -150,23 +148,40 @@ function loadMyCollectCity(){ if(myCollectCitys && myCollectCitys.length>0){ for(var j in myCollectCitys){ var curCity = myCollectCitys[j] - var m = 0; - axios.all([loadCityPriceInfo(curCity), detail(curCity), loadCityPricesAndCounts(curCity), loadHotDistrict(curCity)]) + createData(curCity, j); + + + } + } + + + + }).catch(function (error) { + alert(error) + console.log(error); + }); +} + +function createData(curCity, i){ + var len = parseInt(i) + if(len<10){ + axios.all([loadCityPriceInfo(curCity), detail(curCity), loadCityPricesAndCounts(curCity), loadHotDistrict(curCity)]) .then(axios.spread(function (acct, perms, trends, nearDists) { var cityObj = new Object(); var data1 = acct.data.data - cityObj.hrefId = "tabQuotation"+(parseInt(m)+2) - cityObj.numId_up_chart = (parseInt(m)+1)+"_up_chart"; - cityObj.numId_down_chart = (parseInt(m)+1)+"_down_chart"; - cityObj.numId_price_chart = (parseInt(m)+1)+"_price_chart"; + + cityObj.hrefId = "tabQuotation"+(len+2) + + cityObj.numId_up_chart = (len+1)+"_up_chart"; + cityObj.numId_down_chart = (len+1)+"_down_chart"; + cityObj.numId_price_chart = (len+1)+"_price_chart"; cityObj.colled = false; if(IsInArray(collecteds, curCity)){ cityObj.colled = true; } - m = m + 1; if(data1){ cityObj.city = data1.city cityObj.cityTopMonthAvgPrice = data1.cityTopMonthAvgPrice @@ -207,15 +222,8 @@ function loadMyCollectCity(){ ret.push(cityObj); myDatasVue.$data.cityDatas = ret; })); - } - } - - - - }).catch(function (error) { - alert(error) - console.log(error); - }); + } + } function nameConver(textName){ diff --git a/fangija-zsyf/views/component/nearDist.js b/fangija-zsyf/views/component/nearDist.js index aa13d18..99b2532 100644 --- a/fangija-zsyf/views/component/nearDist.js +++ b/fangija-zsyf/views/component/nearDist.js @@ -8,7 +8,7 @@ Vue.component('near-dist-component', {
-
{{dist.name}}
+
{{dist.sname}}
{{dist.avgPrice}}元/㎡
@@ -46,7 +46,7 @@ Vue.component('near-dist-component', { if(length > 5){ textStr = textName.substr(0,5)+ "..."; } - o.name=textStr; + o.sname=textStr; if(ret.length <= 5){ ret.push(o); } diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index ebcb517..ed6cd92 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -306,9 +306,883 @@ -
+ + + diff --git a/fangija-zsyf/views/loan/loanInfo.html b/fangija-zsyf/views/loan/loanInfo.html index a15ba34..500cae2 100644 --- a/fangija-zsyf/views/loan/loanInfo.html +++ b/fangija-zsyf/views/loan/loanInfo.html @@ -135,6 +135,13 @@ 按城市等级
+
+
+
+
+
+
+
@@ -1057,6 +1064,44 @@ $(".checkbox").on("click", function () { $(this).find("i").addClass("current"); }); +function req(city){ + //city=city.replace("","") + $("#input_city").val(city); + //potenialIndex(city); +} +//城市选择 +//$("#cityCopy").html($('.tabs').html()) +var getAllCitys = function() { + var list = new Array(); + $("#tabCity1 #cityContainer .city p").each(function(i, o) { + list.push($(o).text()); + }); + return list; +} + +var search = function(){ + var city = $("#citySearchInp").val(); + $("#selectContainer .city-list").empty(); + $("#selectContainer").show(); + var cityList = getAllCitys(); + for(var i=0;i"+cityList[i]+"

"); + } + } + if(city == ""){ + $("#selectContainer").hide(); + } +} + +$("#citySearchInp").bind('input propertychange keyup', function() { + search(); +}); + +$("#citySearchInp").bind('keyup', function() { + search(); +}); + diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 9e4d085..dcf49c4 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -194,8 +194,7 @@ function onPlusReady() { sharehrefTitle = data.title sharehrefDes = data.introduction - picUrl = data.coverImg - + picUrl = data.smallCoverImg //加载评论列表 addItems(itemsPerLoad, 0); //是否收藏 diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index d520c2d..53b4c9d 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -106,8 +106,12 @@ mui.init({ function logout() { localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); - back(); + //退出登录之前loading下个人中心 + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + timer.start(); } + function download(imgUrl) { var suffix = '/qun.png'; var downLoader = plus.downloader.createDownload(imgUrl, { @@ -138,6 +142,26 @@ mui.plusReady(function() { }); }); +//退出登录等待两秒 +timer = { + countdown:2, + start:function(){ + countdown = 2 + timer.down() + }, + down:function(){ + countdown -- + if(countdown <= 0){ + back(); + return; + }else{ + setTimeout(timer.down, 1000) + } + }, + cancel:function(){ + countdown = 0 + } +} \ No newline at end of file diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 4ef7b99..a0ac6b0 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -50,7 +50,7 @@

立即登录

-
+