From cd3c54f830bf77d4fbfd32ca6ac87c0f5f877d8e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 18:24:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E5=AD=97=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/component/baseInfoComponent.js | 22 ++++++++++++++++++- fangija-zsyf/views/district/detail.html | 3 ++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/component/baseInfoComponent.js b/fangija-zsyf/views/component/baseInfoComponent.js index c83766b..d2f2ca9 100644 --- a/fangija-zsyf/views/component/baseInfoComponent.js +++ b/fangija-zsyf/views/component/baseInfoComponent.js @@ -113,6 +113,7 @@ Vue.component('base-info-component', { var house = response.data.data.houseInfo; if(hs && sr){ addSubstitution(sr, hs, house); + addAdvertisement(); } if(cityPrice){ baseInfo.cityPrice = cityPrice @@ -302,7 +303,26 @@ function addSubstitution(sr, hs, house){ // <#if advertisement?? && advertisement.content?? && advertisement.content?length gt 0> // onclick="openUrl('${basePath}/message/openView?url=${basePath}/mad/adUrlLoad?adid=${advertisement.id!?c}')" ><#if advertisement.content??>${advertisement.content!}

// - $("#suggestDiv").text(s); + $("#suggestDiv p").text(s); $("#suggestDiv").show(); } +function addAdvertisement(){ + axios.get("/rest/changeHouse/position", null).then(function (response) { + var vo = response.data.data + if(vo!=null){ + $('#adBox').show(); + //如果link有值,添加调整路径 + if(vo.link!=null && vo.link.length>0 && vo.content!=null && vo.content.length>0){ + $('#adBox').html(vo.content + ""); + $("#adBox").click(function(){ + clicked('../../views/webview_embed.html', true,false,{},{url:vo.link}) + }) + } + } + }).catch(function (error) { + console.log(error); + }); + +} + diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 65f9576..04cd1c6 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -64,7 +64,8 @@
-

购买 龙盛佳苑 90-110㎡ 的房子,总价预计约为587-717万。
查看详情

+

+
From 377b064ad41890f2ace2f469357ab8d2da7c7dd8 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 18:50:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 3 +- fangija-zsyf/manifest.json | 6 ++- fangija-zsyf/views/changeHouse/index.html | 57 ++++++++++++----------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 8b9fcf3..4380bdf 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,9 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -var BASE_PATH = "http://192.168.10.164:8084"; +//var BASE_PATH = "http://192.168.10.164:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index ff296a5..4063ebe 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1654,7 +1654,8 @@ "css/theme-blue.css" ], "refer": [ - "views/house/add.html" + "views/house/add.html", + "views/webview_embed.html" ], "priority": 0 }, @@ -1768,7 +1769,8 @@ "resources": [], "refer": [ "views/rent/rentManager.html", - "views/loan/loanInfo.html" + "views/loan/loanInfo.html", + "views/changeHouse/index.html" ], "priority": 0 } diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 3cce608..2c98b8b 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1301,6 +1301,8 @@ var houseListData = new Vue({ } }) + + var step2Vue = new Vue({ el: '#step2Div', data: { @@ -1308,28 +1310,7 @@ var step2Vue = new Vue({ regions : [] }, methods:{ - //加载第二步的区域列表 - loadRegion: function(){ - - //this.defaultCity = dCity - //loadingRegion(dCity); - plus.geolocation.getCurrentPosition(function(p){ - city = p.address.city; - - var formatCity = formatBaiduCity(city); - step2Vue.defaultCity = formatCity - loadingRegion(formatCity); - }, function(e){ - step2Vue.defaultCity = dCity - loadingRegion(dCity); - }, - { - provider:'baidu', - enableHighAccuracy:true, - coordsType:'bd09ll' - } - ); - }, + clickTags: function(e){ if($(event.target).hasClass("active")){ @@ -1351,11 +1332,11 @@ var step2Vue = new Vue({ } }, created:function(){ - - this.loadRegion(); + //this.loadRegion(); } }) + document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); @@ -1371,8 +1352,32 @@ function onPlusReady() { fillHouseInfo(houseId); } - + //加载第二步的区域列表 + plus.geolocation.getCurrentPosition(function(p){ + city = p.address.city; + + var formatCity = formatBaiduCity(city); + if(formatCity){ + step2Vue.defaultCity = formatCity + loadingRegion(formatCity); + }else{ + step2Vue.defaultCity = dCity + loadingRegion(dCity); + } + + }, function(e){ + step2Vue.defaultCity = dCity + loadingRegion(dCity); + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); } + + //修改置换建议填充默认值 function updateChangeSubtation(hsId){ axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{ @@ -1429,7 +1434,7 @@ function fillHouseInfo(houseId){ var data = response.data.data; if(data){ addBaseHouseInfo(data); - baseInfo.houseId = hs.houseId + baseInfo.houseId = houseId } }).catch(function (error) { console.log(error); From 21ffc8ac9bd1ed00a021a77b4081d630ece0556a Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Tue, 8 May 2018 19:06:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=88=BF=E4=BA=A7?= =?UTF-8?q?=E4=B8=AD=E4=BB=8B=E9=83=A8=E5=88=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index ca2313d..814eefa 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -417,6 +417,22 @@ function getAnalysisDetail(){ houseInfo.agencyLevel = resultsMap.agencyLevel; houseInfo.maxCityAgency = resultsMap.maxCityAgency; $('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%"); + //控制周边中介量在当前城市排名显示 + if(resultsMap.maxCityAgency == 0 || resultsMap.agencyLevel == 0 ){ + $('#maxCityAgencyContent').hide(); + } + //周边房产中介显示 + if(resultsMap.agencyCount == 0){ + $('#agencyCountContent').hide(); + } + //知名中介 + if(resultsMap.famousAgency == 0){ + $('#famousAgencyContent').hide(); + } + //其他中介 + if(resultsMap.otherAgency == 0){ + $('#otherAgencyContent').hide(); + } //全局变量赋值 _evalDate = _houseInfo.evalDate; From ecbefabbbade9f132b1c873fbc2026cc9f20ada3 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Tue, 8 May 2018 19:07:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=88=BF=E4=BA=A7?= =?UTF-8?q?=E4=B8=AD=E4=BB=8B=E9=83=A8=E5=88=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/saleAnalysis/saleAnalysis.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html index 8d0350d..bab03a1 100644 --- a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html +++ b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html @@ -147,25 +147,25 @@
    -
  • +
  • 周边房产中介
    {{agencyCount}}家
  • -
  • +
  • 知名中介:
    {{famousAgency}}家
  • -
  • +
  • 其他中介:
    {{otherAgency}}家
  • -
  • +
  • 周边中介量在{{city}}排名:{{agencyLevel}}%