diff --git a/fangija-zsyf/images/default_share.png b/fangija-zsyf/images/default_share.png
new file mode 100644
index 0000000..aa06ca6
Binary files /dev/null and b/fangija-zsyf/images/default_share.png differ
diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js
index 4f34b3a..674c45b 100644
--- a/fangija-zsyf/js/district/districtDetail.js
+++ b/fangija-zsyf/js/district/districtDetail.js
@@ -542,11 +542,22 @@ function showRentChart2(categories, series, roomDatas){
fontSize: 12
},
formatter: function (params) {
- if(params[0].value){
- var res = params[0].name + '
' + "租金:"+params[0].value + '元/月';
- return res;
+ if(params && params.length>0){
+ var s = "";
+ for(var i in params){
+ var ob = params[i]
+ if(i == 0){
+ s += ob.name+"
";
+ }
+ if(ob.value){
+ s += ob.seriesName+ ": "+ ob.value + '元/月
';
+ }
+ }
+
+ if(s){
+ return s;
+ }
}
-
}
},
grid:{
diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
index b3a6aaa..a5324d4 100644
--- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
+++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
@@ -460,8 +460,24 @@ function addItemsGuaPai(resultsMap){
htmlGuaPai += "
"+resultsMap.houses[i].district_name+""+resultsMap.houses[i].area+"㎡
";
var tempTotalPrice = resultsMap.houses[i].total_price == 0?"暂无":(parseFloat(resultsMap.houses[i].total_price)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.houses[i].avg_price == 0?"暂无":resultsMap.houses[i].avg_price+"元/㎡";
+ var roomHallDirectionFitment = "";
+ if(resultsMap.houses[i].room != undefined && resultsMap.houses[i].room != 0 && resultsMap.houses[i].hall != undefined && resultsMap.houses[i].hall != 0){
+ roomHallDirectionFitment += resultsMap.houses[i].room+"室"+resultsMap.houses[i].hall+"厅";
+ if((resultsMap.houses[i].direction != undefined && resultsMap.houses[i].direction != "") || (resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != "")){
+ roomHallDirectionFitment += "/";
+ }
+ }
+ if(resultsMap.houses[i].direction != undefined && resultsMap.houses[i].direction != ""){
+ roomHallDirectionFitment += resultsMap.houses[i].direction;
+ if(resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != ""){
+ roomHallDirectionFitment += "/";
+ }
+ }
+ if(resultsMap.houses[i].fitment != undefined && resultsMap.houses[i].fitment != ""){
+ roomHallDirectionFitment += resultsMap.houses[i].fitment;
+ }
htmlGuaPai += "
"+tempTotalPrice+"