diff --git a/fangija-zsyf/images/rankingImg01.png b/fangija-zsyf/images/rankingImg01.png
index c2e766b..c391500 100644
Binary files a/fangija-zsyf/images/rankingImg01.png and b/fangija-zsyf/images/rankingImg01.png differ
diff --git a/fangija-zsyf/images/rankingImg02.png b/fangija-zsyf/images/rankingImg02.png
index f54f39f..7d1d589 100644
Binary files a/fangija-zsyf/images/rankingImg02.png and b/fangija-zsyf/images/rankingImg02.png differ
diff --git a/fangija-zsyf/images/rankingImg03.png b/fangija-zsyf/images/rankingImg03.png
index c1eb6f7..7c2e225 100644
Binary files a/fangija-zsyf/images/rankingImg03.png and b/fangija-zsyf/images/rankingImg03.png differ
diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js
index aa4107e..1835556 100644
--- a/fangija-zsyf/js/district/districtDetail.js
+++ b/fangija-zsyf/js/district/districtDetail.js
@@ -276,6 +276,7 @@ function loadKLineData(city, region, name){
//option01.series[0].data = counts
option01.series[0].data = trends
curOption = option01;
+ var myChart01 = echarts.init(document.getElementById('chart01'));
myChart01.setOption(option01,true);
// }else{
// option02.xAxis[0].data = times
diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js
index 06cb7f4..29ad655 100644
--- a/fangija-zsyf/js/quotations/collectCity.js
+++ b/fangija-zsyf/js/quotations/collectCity.js
@@ -1,7 +1,7 @@
var city = ""
var myCollectCitys = [];
-var lat;
-var lng;
+var lat = 31.222578;
+var lng = 121.359555;
var allCity = []
var myDatasVue = new Vue({
el: '#contentTabDiv',
@@ -11,6 +11,13 @@ var myDatasVue = new Vue({
}
})
+var citysVue = new Vue({
+ el: '#tabCityDiv',
+ data: {
+ citys:[]
+ }
+})
+
var date = new Date();
var year = date.getFullYear()+'年';
var month = date.getMonth()+1+'月';
@@ -24,23 +31,7 @@ var month = date.getMonth()+1+'月';
loadMyCollectCity();
-// 获取当前用户位置
-function getPosition(){
- plus.geolocation.getCurrentPosition(function(p){
- city = p.address.city;
- myCollectCitys.push(city);
- lng = p.coords.longitude;//获取到当前位置的经度
- lat = p.coords.latitude;//获取到当前位置的纬度;
- }, function(e){
-
- },
- {
- provider:'baidu',
- enableHighAccuracy:true,
- coordsType:'bd09ll'
- }
- );
-}
+
@@ -147,47 +138,69 @@ function loadMyCollectCity(){
for(var i in curDatas){
var curCity = curDatas[i]
if(!IsInArray(myCollectCitys, curCity)){
-
allCity.push(curCity)
- var j = 1;
- axios.all([loadCityPriceInfo(curCity), detail(curCity), loadCityPricesAndCounts(curCity)])
- .then(axios.spread(function (acct, perms, trends) {
- var cityObj = new Object();
- var data1 = acct.data.data
- cityObj.numId_up_chart = j+"_up_chart";
- cityObj.numId_down_chart = j+"_down_chart";
- cityObj.numId_price_chart = j+"_price_chart";
- j = j+1;
- if(data1){
- cityObj.city = data1.city
- cityObj.cityTopMonthAvgPrice = data1.cityTopMonthAvgPrice
- cityObj.downChance = data1.downChance
- cityObj.follow = data1.follow
- cityObj.index = data1.index
- cityObj.oneMonthUpDownRange = (data1.oneMonthUpDownRange*100).toFixed(2)
- cityObj.oneYearUpDownRange = data1.oneYearUpDownRange
- cityObj.rangeLevel = data1.rangeLevel
- cityObj.time = year + month
- }
- var data2 = perms.data.data
- if(data2){
- cityObj.downRate = data2.downRate
- cityObj.upRate = data2.upRate
- }
- var data3 = trends.data.data
- if(data3){
- cityObj.times = data3.times
- cityObj.cityPriceMap = data3.cityPriceMap
- cityObj.countMap = data3.countMap
- }
- ret.push(cityObj);
- myDatasVue.$data.cityDatas = ret;
- //console.log(myDatasVue.$data.cityDatas.length);
- }));
+ myCollectCitys.push(curCity);
}
}
- //myDatasVue.$data.cityDatas = ret;
}
+
+ 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)])
+ .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";
+ m = m + 1;
+ if(data1){
+ cityObj.city = data1.city
+ cityObj.cityTopMonthAvgPrice = data1.cityTopMonthAvgPrice
+ cityObj.downChance = data1.downChance
+ cityObj.follow = data1.follow
+ cityObj.index = data1.index
+ cityObj.oneMonthUpDownRange = (data1.oneMonthUpDownRange*100).toFixed(2)
+ cityObj.oneYearUpDownRange = data1.oneYearUpDownRange
+ cityObj.rangeLevel = data1.rangeLevel
+ cityObj.time = year + month
+ }
+ var data2 = perms.data.data
+ if(data2){
+ cityObj.downRate = data2.downRate
+ cityObj.upRate = data2.upRate
+ }
+ var data3 = trends.data.data
+ if(data3){
+ cityObj.times = data3.times
+ cityObj.cityPriceMap = data3.cityPriceMap
+ cityObj.countMap = data3.countMap
+ }
+ var data4 = nearDists.data.data
+ if(data4){
+ var nears = []
+ for(var n in data4){
+ var v = data4[n]
+ var nearObj = new Object();
+ nearObj.city = v.city
+ nearObj.region = v.region
+ nearObj.name = v.name
+ nearObj.avgPrice = v.avgPrice
+ nears.push(nearObj);
+ }
+ cityObj.nears = nears
+ }
+ ret.push(cityObj);
+ myDatasVue.$data.cityDatas = ret;
+ }));
+ }
+ }
+
}).catch(function (error) {
@@ -209,14 +222,11 @@ function loadCityPricesAndCounts(city){
return axios.get("/rest/quotations/loadCityPriceTrends?city="+city+"&type=2")
}
-function loadNearDistrict(){
- return axios.get("/rest/districts/nearDistrict?lat="+lat+"&lng="+lng)
+function loadHotDistrict(city){
+ return axios.get("/rest/districts/hotDistricts?city="+city+"&top=5")
}
-$(".button").click(function(){
- console.log("type:"+$(this).text())
- var type = (this).attr("v")
- var city = (this).attr("city")
+function clickTrend(city, type, num){
axios.get("/rest/quotations/loadCityPriceTrends", {
params: {
city: city,
@@ -224,7 +234,7 @@ $(".button").click(function(){
}
}).then(function (response) {
- var datas = trends.data.data
+ var datas = response.data.data
var prices = []
var counts = []
var times = datas.times
@@ -234,20 +244,32 @@ $(".button").click(function(){
var pm = datas.cityPriceMap;
var cm = datas.countMap;
if(pm){
- prices.push(pm[time])
+ if(pm[time]){
+ prices.push(pm[time])
+ }else{
+ prices.push(null)
+ }
+
}
if(cm){
- counts.push(cm[time]);
+ if(cm[time]){
+ counts.push(cm[time]);
+ }else{
+ counts.push(null);
+ }
+
}
}
-
- showChart(num+"_price_chart", obj.times, prices, counts)
+
+ $("div[tid='"+num+"']").find("a").removeClass("active")
+ $("div[tid='"+num+"']").find("a[v='"+type+"']").addClass("active")
+ showChart(num+"_price_chart", times, prices, counts)
}).catch(function (error) {
alert(error)
console.log(error);
});
-})
+}
function IsInArray(arr, val){
@@ -261,14 +283,32 @@ function loadChart(){
var d2 = allCity.length;
if(d2>0 && d2==d1){
+ loadTabCity();
+
loadUpOrDownChart();
loadTrends();
+
window.clearInterval(t1);
}
}
+
+function loadTabCity(){
+ var datas = myDatasVue.$data.cityDatas
+ var citys = []
+ for(var i in datas){
+ var obj = datas[i]
+ var numObj = new Object();
+ numObj.hrefId = "tabQuotation"+(parseInt(i)+2)
+ numObj.city = obj.city
+ citys.push(numObj)
+ }
+ citysVue.$data.citys = citys;
+
+}
+
function loadUpOrDownChart(){
var datas = myDatasVue.$data.cityDatas
for(var i in datas){
@@ -421,3 +461,22 @@ function showChart(idDom, categories, prices, counts){
}]
});
}
+
+
+function showDistrictDetail(index, city){
+ var datas = myDatasVue.$data.cityDatas
+ if(datas){
+ for(var i in datas){
+ var obj = datas[i]
+ if(obj.name == city){
+ var dists = obj.nears
+ var dm = dists[index]
+ clicked('../district/detail.html',true,false,{},{city:dm.city,region:dm.region,name:dm.name});
+ }
+ }
+ }
+}
+
+function showRegionInfo(city){
+
+}
diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html
index d481880..3bfe6c3 100644
--- a/fangija-zsyf/views/house/houseDetail.html
+++ b/fangija-zsyf/views/house/houseDetail.html
@@ -33,11 +33,13 @@
-->
房产行情
-
-
-
-
+
+
+
+
@@ -172,244 +176,83 @@
当前参考均价
-
65079元/㎡
+
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
-
-
-
+
-
+
-
-
- 2.13%
+
-
-
- 1.41%
+
-
-

城市报告

-
-
-
-
-
-
- -
-
-
总人口:2418.33万(2017年常住人口)
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
生产总值:30133.86亿元(2017年)
-
-
- -
-
-
人均生产总值:124536元(2017年)
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
著名景点:外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
+
热门小区
-
-
-
+
+
-
-
-
-
-
68777元/㎡
+
{{nearDist.avgPrice}}元/㎡
+
-
+
+
+
+
+
+