From 195218c791f192186e621965fcfff6e122bf7155 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Thu, 3 May 2018 16:20:55 +0800 Subject: [PATCH 01/15] YOUFANG1.0.4 --- fangija-zsyf/views/user/userInfo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 65cbbdd..f6add16 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -278,7 +278,7 @@ var toolList = new Vue({ }, methods:{ goto:function(url){ - alert(url) +// alert(url) if (url != null && url != "") { clicked('../webview_embed.html', true,false,{},{url:url}) } From 79f519e06b11aacaf5810d2cf2bdb492fe353f07 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 3 May 2018 18:23:15 +0800 Subject: [PATCH 02/15] aa --- fangija-zsyf/config.js | 4 ++-- fangija-zsyf/views/house/houseDetail.html | 23 +++++++++++++++++++---- fangija-zsyf/yfindex.html | 1 + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index fb104e1..e735e0f 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,9 +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.47:8086"; +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.53:8084"; +//var BASE_PATH = "http://192.168.10.53:8084"; //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/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 57bbbe0..311a16c 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -34,6 +34,9 @@ +

房产行情

@@ -1211,11 +1214,17 @@ $.config = {router: false} - + + - \ No newline at end of file From 08f518dcb96cfd5e729c067969ff5c27b4bfd078 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 3 May 2018 19:39:32 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 527 +++++++++++++++++++ 1 file changed, 527 insertions(+) create mode 100644 fangija-zsyf/js/saleAnalysis/saleAnalysis.js diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js new file mode 100644 index 0000000..d2c0a6f --- /dev/null +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -0,0 +1,527 @@ +//房产详情页面传入houseId +var houseId; +var disName; +var disRegion; +var disCity; + +var houseInfo = new Vue({ + el: '#houseInfo', + data: { + name: "", + city: "", + price: "", + liveStatus: "", + totalPrice: "", + houseRoomNum: "", + houseArea: "", + floorHeight: "", + evalDate: "", + roseRanking: "", + avgpriceRanking: "", + minSellPrice: "", + maxSellPrice: "", + minAndMaxTotalPrice: "", + minAndMaxPrice: "", + agencyCount: "", + famousAgency: "", + otherAgency: "", + agencyLevel: "", + maxCityAgency: "" + } +}) + +/* 增长率及收益 */ +$(document).on('click','.open-modal01', function () { + $.closeModal('.my-popover01'); + $('.modal01').show(); + $('.modal01-overlay').show(); +}); + +/* 增长率及收益-取消 */ +$(document).on('click','.modal01 .cancel_btn', function () { + $('.modal01').hide(); + $('.modal01-overlay').hide(); + window.location.reload(); +}); + +/* 增长率及收益-关闭 */ +$(document).on('click','.modal01 .close', function () { + $('.modal01').hide(); + $('.modal01-overlay').hide(); + window.location.reload(); +}); + +/* 增长率及收益-确定 */ +$(document).on('click','.modal01 .confirm_btn', function () { + var a = $("#input_time").val(); + var b = $("#input_price").val(); + if(a == ""){ + $.toast("请选择购入时间"); + return false; + }else if(b == ""){ + $.toast("请输入购入价格"); + return false; + }else{ + $(".rateBox01").hide(); + $(".rateBox02").show(); + $('.modal').hide(); + $('.modal01').hide(); + $('.modal01-overlay').hide(); + } +}); + +/* 点击遮罩弹窗隐藏 */ +$(document).on('click','.modal01-overlay', function () { + $('.modal01').hide(); + $('.modal01-overlay').hide(); +}); + +/* 选择-购入时间 */ +$("#input_time").datetimePicker({ + toolbarTemplate: '
\ + \ +

购入时间

\ +
' +}); + +/* 说明-交易活跃度 */ +$(document).on('click','.alert-text-title02', function () { + $.alert('交易活跃度是根据房产的价值、周边配套、供需关系等情况来衡量,能否在市场中快速交易变现的评级。', '交易活跃度'); +}); + +/* button状态切换 */ +$(".content-block .button").on("click", function () { + $(this).parent().children().removeClass("active"); + $(this).addClass("active"); +}); + +/** + * 请求构造Chart数据 + * @param {Object} type + */ +function loadingChart(type){ + axios.get(BASE_PATH + "/rest/saleAnalysis/getDistrictPriceZouShi", + { + params: { + id: houseId, + type: type + } + }).then(function (response) { + if(response.data.status){ + var categories = new Array(); + var series = new Array(); + var cityObj = new Object(); + var regionObj = new Object(); + var districtObj = new Object(); + + //城市 地区 小区 + districtObj.name = disName; + regionObj.name = disRegion; + cityObj.name = disCity; + + //构造series系列 + series.push(districtObj); + series.push(regionObj); + series.push(cityObj); + + //构造数据集 + var cityDatas = new Array(); + var regionDatas = new Array(); + var districtDatas = new Array(); + + var m = response.data.data.timeKeys; + for(var i = 0; i < m.length; i++){ + var date_ = new Date(Number(m[i])) + categories.push(formatTime_(date_)); + if(response.data.data.cityAvgZouShi[m[i]] == undefined){ + cityDatas.push(null); + }else { + cityDatas.push(response.data.data.cityAvgZouShi[m[i]]); + } + if (response.data.data.regionAvgZouShi[m[i]] == undefined) { + regionDatas.push(null); + }else { + regionDatas.push(response.data.data.regionAvgZouShi[m[i]]); + } + if (response.data.data.districtAvgZouShi[m[i]] == undefined){ + districtDatas.push(null); + }else { + districtDatas.push(response.data.data.districtAvgZouShi[m[i]]); + } + } + cityObj.data = cityDatas; + regionObj.data = regionDatas; + districtObj.data = districtDatas; + //调用图标方法 + showAvgPriceChat(categories, series); + }else{ + $.toast(response.data.message); + } + }).catch(function (error) { + console.log(error); + }); +} + +/** + * 均价走势 + * @param {Object} categories + * @param {Object} series + */ +function showAvgPriceChat(categories, series) { + charts = Highcharts.chart('chart', { + title: { + text: '' + }, + subtitle: { + text: '', + x: -20 + }, + colors: ['#F88C9F', '#AAD672', '#AE94E9'], + xAxis: { + categories: categories, + boundaryGap: false, + tickInterval: 2, + tickLength: 6, + labels: { + style: { + fontSize: 12 + } + } + }, + yAxis: { + allowDecimals: false, + title: { + text: '' + }, + plotLines: [{ + value: 0, + width: 1, + color: '#666' + }] + }, + tooltip: { + shared: true, + valueSuffix: '元/㎡' + }, + legend: { + layout: 'horizontal', + align: 'center', + verticalAlign: 'bottom', + y: 0, + borderWidth: 0 + }, + plotOptions: { + line: { + connectNulls: true //该设置会连接空值点 + }, + series: { + events: { + legendItemClick: function(e) { + return false; + } + }, + marker: { + //enabled: false 当系类点太多,可以用这个属性去掉图标上面的symbol, 既显示成直线 + radius: 3, //曲线点半径,默认是4 + symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle" + } + } + }, + series: series, + credits: { + enabled: false + } + }) +} + +/** + * 出售分析页面详情AJAX请求 + */ +function getAnalysisDetail(){ + axios.get(BASE_PATH + "/rest/saleAnalysis/analysisDetail", + { + params: { + id: houseId + } + }).then(function (response) { + var resultsMap = response.data.data; + var _houseInfo = resultsMap.hInfo; + var tags = resultsMap.tags; + if(response.data.status){ + houseInfo.name = _houseInfo.name; + if(_houseInfo.liveStatus!=null && _houseInfo.liveStatus.length>0){ + houseInfo.liveStatus = ""+_houseInfo.liveStatus+""; + }else{ + houseInfo.liveStatus = "其它"; + } + $('#liveStatus').html(houseInfo.liveStatus); + houseInfo.totalPrice = (_houseInfo.totalPrice) == 0?"暂无":(parseFloat(_houseInfo.totalPrice)/10000).toFixed(2)+"万"; + houseInfo.houseRoomNum = _houseInfo.houseRoomNum==""?"暂无":_houseInfo.houseRoomNum; + houseInfo.houseArea = _houseInfo.area + "㎡"; + houseInfo.floorHeight = (_houseInfo.floor == 0 || _houseInfo.height == 0)?"暂无":_houseInfo.floor + "/" + _houseInfo.height + "层"; + houseInfo.evalDate = _houseInfo.evalDate == null?"暂无":formatTime(_houseInfo.evalDate) + "估值"; + if(tags!=null && tags.length>0){ + var tempTag = ""; + for(var i in tags){ + tempTag += ""+tags[i]+"" + } + }else{ + tempTag = "暂无"; + } + $('#moreTag').html(tempTag); + //暂无先用riskScore03样式,后期需求有要求在调整 + if(_houseInfo.totalScore == null){ + $('#riskScore').addClass('riskScore03'); + $('#riskScore').html("暂无"); + }else if(_houseInfo.totalScore>=0 && _houseInfo.totalScore<=26){ + $('#riskScore').addClass('riskScore01'); + $('#riskScore').html("很差"); + }else if(_houseInfo.totalScore>26 && _houseInfo.totalScore<=38){ + $('#riskScore').addClass('riskScore02'); + $('#riskScore').html("较差"); + }else if(_houseInfo.totalScore>38 && _houseInfo.totalScore<=70){ + $('#riskScore').addClass('riskScore03'); + $('#riskScore').html("良好"); + }else if(_houseInfo.totalScore>70 && _houseInfo.totalScore<=100){ + $('#riskScore').addClass('riskScore04'); + $('#riskScore').html("很好"); + } + //控制增长率及收益显示/隐藏 + if(_houseInfo.purchaseDate != null){ + $('#showRateBox01').hide(); + $('#showRateBox02').show(); + //年增长率大于零 + if(resultsMap.rate > 0 && resultsMap.increment > 0){ + $('#rateTre').addClass("up"); + $('#incrementTre').addClass("up"); + $('#rateValue').html(resultsMap.rate + "%") + $('#incrementValue').html(resultsMap.increment + "万"); + }else if(resultsMap.rate < 0 && resultsMap.increment < 0){ + $('#rateTre').addClass("down"); + $('#incrementTre').addClass("down"); + $('#rateValue').html(resultsMap.rate + "%") + $('#incrementValue').html(resultsMap.increment + "万"); + }else{ + $('#rateValue').css("color", "#EB5F34"); + $('#incrementValue').css("color", "#EB5F34"); + $('#rateValue').html("暂无") + $('#incrementValue').html("暂无"); + } + }else{ + $('#showRateBox01').show(); + $('#showRateBox02').hide(); + } + //增长率及收益跳转链接是否显示 + if(resultsMap.ad!=null){ + $('#showAdBox1').show(); + $('#showAdBox1Content').html(resultsMap.ad.content + ""); + //如果link有值,添加调整路径 + if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0){ + $("#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; + houseInfo.price = _houseInfo.price; + houseInfo.minSellPrice = _houseInfo.minSellPrice == 0?"暂无": _houseInfo.minSellPrice + "元/㎡"; + houseInfo.maxSellPrice = _houseInfo.maxSellPrice == 0?"暂无": _houseInfo.maxSellPrice + "元/㎡"; + $('#roseRankingPercent').css("width", houseInfo.roseRanking+"%"); + $('#sliderNotePercent').css("left", resultsMap.priceRateContent+"%"); + $('#curRatePercent').css("width", resultsMap.curRate+"%"); + //挂牌建议 + 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){ + $("#showAdBox2").click(function(){ + clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad1.link}) + }) + } + } + houseInfo.agencyCount = resultsMap.agencyCount; + houseInfo.famousAgency = resultsMap.famousAgency; + houseInfo.otherAgency = resultsMap.otherAgency; + houseInfo.agencyLevel = resultsMap.agencyLevel; + houseInfo.maxCityAgency = resultsMap.maxCityAgency; + $('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%"); + //调用构造数据方法 + addItemsGuaPai(resultsMap); + addItemsChengJiao(resultsMap); + }else{ + $.toast(response.data.message); + } + }).catch(function (error) { + console.log(error); + }); +} + +/** + * 构造挂牌参考数据 + * @param {Object} resultsMap + */ +function addItemsGuaPai(resultsMap){ + if((resultsMap.disHouses!=null && resultsMap.disHouses.length>0) || (resultsMap.houses!=null && resultsMap.houses.length>0)){ + var htmlGuaPai = ""; + htmlGuaPai += '
挂牌参考'; + htmlGuaPai += '
'; + if(resultsMap.houses!=null && resultsMap.houses.length>0){ + htmlGuaPai += '周边'; + } + if(resultsMap.disHouses!=null && resultsMap.disHouses.length>0){ + if(resultsMap.houses!=null && resultsMap.houses.length>0){ + htmlGuaPai += '本小区'; + }else{ + htmlGuaPai += '本小区'; + } + } + htmlGuaPai += '
'; + if(resultsMap.houses!=null && resultsMap.houses.length>0){ + htmlGuaPai += ''; + } + if(resultsMap.disHouses!=null && resultsMap.disHouses.length>0){ + if(resultsMap.houses!=null && resultsMap.houses.length>0){ + htmlGuaPai += '
'; + $('#showTopic1').html(htmlGuaPai); + $('#showTopic1').show(); + } +} + +/** + * 构造成交情况数据 + * @param {Object} resultsMap + */ +function addItemsChengJiao(resultsMap){ + if((resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0) || (resultsMap.sells!=null && resultsMap.sells.length>0)){ + var htmlChengJiao = ""; + htmlChengJiao += '
成交情况'; + htmlChengJiao += '
'; + if(resultsMap.sells!=null && resultsMap.sells.length>0){ + htmlChengJiao += '周边'; + } + if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){ + if(resultsMap.sells!=null && resultsMap.sells.length>0){ + htmlChengJiao += '本小区'; + }else{ + htmlChengJiao += '本小区'; + } + } + htmlChengJiao += '
'; + if(resultsMap.sells!=null && resultsMap.sells.length>0){ + htmlChengJiao += ''; + } + if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){ + if(resultsMap.sells!=null && resultsMap.sells.length>0){ + htmlGuaPai += '
'; + $('#showTopic2').html(htmlChengJiao); + $('#showTopic2').show(); + } +} + +//按照时间范围加载数据 +$(".avgPriceTrend a").click(function(){ + var type = $(this).attr("data-id"); + $(".avgPriceTrend a").removeClass("active") + $(this).addClass('active'); + loadingChart(type); +}); + +//时间格式方法 +function formatTime(_time){ + var _now = new Date(_time); + var _year = _now.getFullYear(); + var _month = _now.getMonth()+1; + var _date = _now.getDate(); + return _year + "/" + _month + "/" + _date; +} + +//时间格式方法 +function formatTime_(_time){ + var _now = new Date(_time); + var _year = _now.getFullYear(); + var _month = _now.getMonth()+1; + var _date = _now.getDate(); + return _year + "-" + _month + "-" + _date; +} + +//document.addEventListener('plusready', onPlusReady, false); + +//function onPlusReady(){ + //var self = plus.webview.currentWebview(); + //houseId = self.houseId; + //disName = self.name; + //disRegion = self.region; + //disCity = self.city; +//} + +//提到onPlusReady +houseId = "192988147737427968"; +disName = "佳源上海小城商住楼"; +disRegion = "崇明"; +disCity = "上海"; +getAnalysisDetail(); +loadingChart($(".avgPriceTrend").find("a.active").attr("data-id")); \ No newline at end of file From 29aa162b497043f000b93a5138c48936ac372c8a Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 00:11:19 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/saleAnalysis/saleAnalysis.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html index dc2485c..24fd5cf 100644 --- a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html +++ b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html @@ -209,7 +209,7 @@
购入价格
- +
From 91836c5eef4089e76726e2b09fe24bd3f24dc9f0 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 00:12:45 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 106 +++++++++++++++---- 1 file changed, 88 insertions(+), 18 deletions(-) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index d2c0a6f..8cc15a7 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -3,6 +3,8 @@ var houseId; var disName; var disRegion; var disCity; +var _evalDate; +var totalPricePart; var houseInfo = new Vue({ el: '#houseInfo', @@ -30,7 +32,7 @@ var houseInfo = new Vue({ } }) -/* 增长率及收益 */ +/* 增长率及收益-打开 */ $(document).on('click','.open-modal01', function () { $.closeModal('.my-popover01'); $('.modal01').show(); @@ -41,32 +43,100 @@ $(document).on('click','.open-modal01', function () { $(document).on('click','.modal01 .cancel_btn', function () { $('.modal01').hide(); $('.modal01-overlay').hide(); - window.location.reload(); + //清空对于的输入框 + $("#input_time").val(''); + $("#input_price").val(''); }); /* 增长率及收益-关闭 */ $(document).on('click','.modal01 .close', function () { $('.modal01').hide(); $('.modal01-overlay').hide(); - window.location.reload(); + //清空对于的输入框 + $("#input_time").val(''); + $("#input_price").val(''); }); /* 增长率及收益-确定 */ $(document).on('click','.modal01 .confirm_btn', function () { var a = $("#input_time").val(); var b = $("#input_price").val(); + //_evalDate 已经是由date转换成long类型了 + var evalDate = _evalDate; + var d = new Date($("#input_time").val()).getTime(); + var _houseId = houseId; if(a == ""){ - $.toast("请选择购入时间"); + $.toast("购入时间不能为空"); return false; - }else if(b == ""){ - $.toast("请输入购入价格"); + } + else if(b == ""){ + $.toast("购入价格不能为空"); return false; - }else{ - $(".rateBox01").hide(); - $(".rateBox02").show(); - $('.modal').hide(); - $('.modal01').hide(); - $('.modal01-overlay').hide(); + } + else if(b <= 0){ + $.toast("购入价格大于0"); + return false; + } + else if(d > evalDate){ + $.toast("购入时间不能大于估价时间"); + return false; + } + var days = evalDate - d; + var year = parseInt(days / (1000 * 60 * 60 * 24) / 365) + 1; + var basePrice = totalPricePart; + var up = Number(basePrice) * Math.pow(2, year); + var down = Number(basePrice) * Math.pow(2, -year); + if(Number($("#input_price").val()) > up || Number($("#input_price").val()) < down){ + $('.modal01').hide(); + $.modal({ + title: '购入价格与实际情况偏差较大,是否继续?', + buttons: [ + { + text: '否,修改', + onClick: function() { + $("#input_price").focus(); + $('.modal').remove(); + $('.modal01').show(); + } + }, + { + text: '继续', + onClick: function() { + axios.post(BASE_PATH + "/rest/saleAnalysis/updateEvaluation", + { + houseId: houseId, + purchaseDate: $("#input_time").val(), + purchasePrice: $("#input_price").val() + }).then(function (response) { + var status = response.data.status; + if(status){ + window.location.reload(); + }else{ + $.toast(response.data.message); + } + }).catch(function (error) { + console.log(error); + }); + } + } + ] + }) + } else{ + axios.post(BASE_PATH + "/rest/saleAnalysis/updateEvaluation", + { + houseId: houseId, + purchaseDate: $("#input_time").val(), + purchasePrice: $("#input_price").val() + }).then(function (response) { + var status = response.data.status; + if(status){ + window.location.reload(); + }else{ + $.toast(response.data.message); + } + }).catch(function (error) { + console.log(error); + }); } }); @@ -89,11 +159,6 @@ $(document).on('click','.alert-text-title02', function () { $.alert('交易活跃度是根据房产的价值、周边配套、供需关系等情况来衡量,能否在市场中快速交易变现的评级。', '交易活跃度'); }); -/* button状态切换 */ -$(".content-block .button").on("click", function () { - $(this).parent().children().removeClass("active"); - $(this).addClass("active"); -}); /** * 请求构造Chart数据 @@ -351,6 +416,11 @@ function getAnalysisDetail(){ houseInfo.agencyLevel = resultsMap.agencyLevel; houseInfo.maxCityAgency = resultsMap.maxCityAgency; $('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%"); + + //全局变量赋值 + _evalDate = _houseInfo.evalDate + ""; + totalPricePart = resultsMap.totalPricePart1; + //调用构造数据方法 addItemsGuaPai(resultsMap); addItemsChengJiao(resultsMap); @@ -520,7 +590,7 @@ function formatTime_(_time){ //提到onPlusReady houseId = "192988147737427968"; -disName = "佳源上海小城商住楼"; +disName = "兰凤小区"; disRegion = "崇明"; disCity = "上海"; getAnalysisDetail(); From 55f739dd5d1af9e7bc50051a8c910e02abb0f719 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 00:22:21 +0800 Subject: [PATCH 08/15] Number --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 28 +++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index 8cc15a7..65e4cae 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -578,20 +578,16 @@ function formatTime_(_time){ return _year + "-" + _month + "-" + _date; } -//document.addEventListener('plusready', onPlusReady, false); +document.addEventListener('plusready', onPlusReady, false); -//function onPlusReady(){ - //var self = plus.webview.currentWebview(); - //houseId = self.houseId; - //disName = self.name; - //disRegion = self.region; - //disCity = self.city; -//} - -//提到onPlusReady -houseId = "192988147737427968"; -disName = "兰凤小区"; -disRegion = "崇明"; -disCity = "上海"; -getAnalysisDetail(); -loadingChart($(".avgPriceTrend").find("a.active").attr("data-id")); \ No newline at end of file +function onPlusReady(){ + var self = plus.webview.currentWebview(); + houseId = self.houseId; + disName = self.name; + disRegion = self.region; + disCity = self.city; + //初始化数据 + getAnalysisDetail(); + //初始化图表 + loadingChart($(".avgPriceTrend").find("a.active").attr("data-id")); +} \ No newline at end of file From 08b04d85664265a5600bcd546d52b8c1f32e3781 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 11:31:26 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=88=86=E6=9E=90=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/saleAnalysis/saleAnalysis.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html index 24fd5cf..8d0350d 100644 --- a/fangija-zsyf/views/saleAnalysis/saleAnalysis.html +++ b/fangija-zsyf/views/saleAnalysis/saleAnalysis.html @@ -26,7 +26,7 @@
-

出售分析

From d9e0b33623dbbf498b9da151ed86072d7d5a6fbc Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 11:32:41 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=87=BA=E5=94=AE=E5=88=86=E6=9E=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index 65e4cae..12ec1be 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -418,7 +418,7 @@ function getAnalysisDetail(){ $('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%"); //全局变量赋值 - _evalDate = _houseInfo.evalDate + ""; + _evalDate = _houseInfo.evalDate; totalPricePart = resultsMap.totalPricePart1; //调用构造数据方法 From fd47f73b18b64aa6fda903662ab5309567cc5290 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 4 May 2018 13:13:47 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=A4=84=E7=90=86=20=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20barBorder=20=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 51d3e59..b5635a9 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -63,7 +63,7 @@