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/ad_position_image.js b/fangija-zsyf/js/ad_position_image.js
new file mode 100644
index 0000000..8c77f1c
--- /dev/null
+++ b/fangija-zsyf/js/ad_position_image.js
@@ -0,0 +1,32 @@
+function add_imgage(imageId,adPosition,device){
+ axios.get("/rest/ad/position",{
+ params:{position : adPosition}
+ }).then(function(response){
+ if(response.data.status){
+ h = response.data.data;
+ if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){
+ $("#"+imageId).attr("src",BASE_PATH+"/img/"+h.imgId);
+ }
+ if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){
+ var uid = localStorage.getItem("user_id");
+ var aId=h.id;
+ $("#"+imageId).parent().click(function(){
+ //1.记录点击日志
+ axios.post("/rest/ad/adUrlLoad",{
+ id : aId
+ }).then(function(res){
+ console.log(res);
+ }).catch(function(error){
+ console.log(error);
+ });
+ //2.跳转
+ url=h.link+"?uid="+uid+"&device="+device;
+ //window.location.href=url;
+ clicked("/views/webview_embed.html", true,false,{},{url:url});
+ });
+ }
+ }
+ }).catch(function(error){
+ console.log(error);
+ });
+}
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/push-common.js b/fangija-zsyf/js/push-common.js
index 1c9eb7d..27bb1d2 100644
--- a/fangija-zsyf/js/push-common.js
+++ b/fangija-zsyf/js/push-common.js
@@ -5,6 +5,10 @@
document.addEventListener("plusready", function() {
// 监听点击消息事件
plus.push.addEventListener("click", function(msg) {
+ //刷新个人中心
+ if (plus.webview.getWebviewById('views/user/userInfo.html') != null) {
+ plus.webview.getWebviewById('views/user/userInfo.html').reload();
+ }
// 判断是从本地创建还是离线推送的消息
var payload = msg.payload;
var title = msg.title;
@@ -87,6 +91,10 @@ document.addEventListener("plusready", function() {
// 监听在线消息事件, iOS透传消息在线时会进入这里进行处理
plus.push.addEventListener("receive", function(msg) {
+ //刷新个人中心
+ if (plus.webview.getWebviewById('views/user/userInfo.html') != null) {
+ plus.webview.getWebviewById('views/user/userInfo.html').reload();
+ }
var title = msg.title;
var content = msg.content;
var payload = msg.payload;
diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
index a8ef1ba..ce41422 100644
--- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
+++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
@@ -44,7 +44,7 @@ $(document).on('click','.modal01 .cancel_btn', function () {
$('.modal01').hide();
$('.modal01-overlay').hide();
//清空对于的输入框
- $("#input_time").val('');
+// $("#input_time").val('');
$("#input_price").val('');
});
@@ -53,7 +53,7 @@ $(document).on('click','.modal01 .close', function () {
$('.modal01').hide();
$('.modal01-overlay').hide();
//清空对于的输入框
- $("#input_time").val('');
+// $("#input_time").val('');
$("#input_price").val('');
});
@@ -380,14 +380,16 @@ function getAnalysisDetail(){
//增长率及收益跳转链接是否显示
if(resultsMap.ad!=null){
$('#showAdBox1').show();
- $('#showAdBox1Content').html(resultsMap.ad.content + "
");
//如果link有值,添加调整路径
- if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0){
+ if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0 && resultsMap.ad.content!=null && resultsMap.ad.content.length>0){
+ $('#showAdBox1Content').html(resultsMap.ad.content + "
");
$("#showAdBox1").click(function(){
clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad.link})
})
}
}
+
+ //当前小区在当前城市占比情况
houseInfo.city = _houseInfo.city;
houseInfo.roseRanking = _houseInfo.roseRanking;
houseInfo.avgpriceRanking = _houseInfo.avgpriceRanking;
@@ -397,15 +399,25 @@ function getAnalysisDetail(){
$('#roseRankingPercent').css("width", houseInfo.roseRanking+"%");
$('#sliderNotePercent').css("left", resultsMap.priceRateContent+"%");
$('#curRatePercent').css("width", resultsMap.curRate+"%");
+ if((_houseInfo.roseRanking == 0) && (_houseInfo.avgpriceRanking == 0 || resultsMap.priceRateContent == 0 || _houseInfo.price == 0 || _houseInfo.minSellPrice == 0 || _houseInfo.maxSellPrice == 0 || resultsMap.curRate == 0)){
+ $('#rankingAndPriceContent').hide();
+ }
+ if(_houseInfo.roseRanking == 0){
+ $('#rankingAndPriceContentRanking').hide();
+ }
+ if(_houseInfo.avgpriceRanking == 0 || resultsMap.priceRateContent == 0 || _houseInfo.price == 0 || _houseInfo.minSellPrice == 0 || _houseInfo.maxSellPrice == 0 || resultsMap.curRate == 0){
+ $('#rankingAndPriceContentPrice').hide();
+ }
+
//挂牌建议
houseInfo.minAndMaxTotalPrice = (resultsMap.minTotalPrice==0 || resultsMap.maxTotalPrice==0)?"暂无":(parseFloat(resultsMap.minTotalPrice)/10000).toFixed(2)+"万"+" - "+(parseFloat(resultsMap.maxTotalPrice)/10000).toFixed(2)+"万";
houseInfo.minAndMaxPrice = (resultsMap.minPrice==0 || resultsMap.maxPrice==0)?"暂无":(parseFloat(resultsMap.minPrice)/10000).toFixed(2)+"万/㎡"+" - "+(parseFloat(resultsMap.maxPrice)/10000).toFixed(2)+"万/㎡";
//挂牌建议跳转链接是否显示
if(resultsMap.ad1!=null){
$('#showAdBox2').show();
- $('#showAdBox2Content').html(resultsMap.ad1.content + "
");
//如果link有值,添加调整路径
- if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0){
+ if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0 && resultsMap.ad1.content!=null && resultsMap.ad1.content.length>0){
+ $('#showAdBox2Content').html(resultsMap.ad1.content + "
");
$("#showAdBox2").click(function(){
clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad1.link})
})
@@ -417,6 +429,24 @@ function getAnalysisDetail(){
houseInfo.agencyLevel = resultsMap.agencyLevel;
houseInfo.maxCityAgency = resultsMap.maxCityAgency;
$('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%");
+ //控制周边中介量在当前城市排名显示
+ if(resultsMap.maxCityAgency == 0 || resultsMap.agencyLevel == 0 ){
+ $('#maxCityAgencyContent').hide();
+ //添加此topic, 控制结构显示
+ $('#maxCityAgencyContent_').show();
+ }
+ //周边房产中介显示
+ if(resultsMap.agencyCount == 0){
+ $('#agencyCountContent').hide();
+ }
+ //知名中介
+ if(resultsMap.famousAgency == 0){
+ $('#famousAgencyContent').hide();
+ }
+ //其他中介
+ if(resultsMap.otherAgency == 0){
+ $('#otherAgencyContent').hide();
+ }
//全局变量赋值
_evalDate = _houseInfo.evalDate;
@@ -460,8 +490,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+"