Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1

This commit is contained in:
bayi
2018-05-04 15:17:29 +08:00
10 changed files with 664 additions and 540 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
/**服务端地址**/
//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.161:8084";
+1
View File
@@ -296,6 +296,7 @@ em.down{color:#88D053;}
.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 0.75rem;}
.list-block .add01{padding:0 0.5rem;top:1.1rem;right:0.75rem;}
.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;}
.list-block .delete{width:1.5rem;height:1.55rem;background:url(../images/delete.png) no-repeat center center;background-size:100%;position:absolute;top:-1px;right:0;}
.list-block li.noData{padding:0.75rem;padding-top:1rem;}
.list-block li.noData img{margin:0 auto;}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 621 B

@@ -0,0 +1,594 @@
//房产详情页面传入houseId
var houseId;
var disName;
var disRegion;
var disCity;
var _evalDate;
var totalPricePart;
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();
//清空对于的输入框
$("#input_time").val('');
$("#input_price").val('');
});
/* 增长率及收益-关闭 */
$(document).on('click','.modal01 .close', function () {
$('.modal01').hide();
$('.modal01-overlay').hide();
//清空对于的输入框
$("#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("购入时间不能为空");
return false;
}
else if(b == ""){
$.toast("购入价格不能为空");
return false;
}
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);
});
}
}
]
})
$(".modal-text").css("text-align","center");
} 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);
});
}
});
/* 点击遮罩弹窗隐藏 */
$(document).on('click','.modal01-overlay', function () {
$('.modal01').hide();
$('.modal01-overlay').hide();
});
/* 选择-购入时间 */
$("#input_time").datetimePicker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">购入时间</h1>\
</header>'
});
/* 说明-交易活跃度 */
$(document).on('click','.alert-text-title02', function () {
$.alert('交易活跃度是根据房产的价值、周边配套、供需关系等情况来衡量,能否在市场中快速交易变现的评级。', '交易活跃度');
});
/**
* 请求构造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 = "<small>"+_houseInfo.liveStatus+"</small>";
}else{
houseInfo.liveStatus = "<small>其它</small>";
}
$('#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 += "<small>"+tags[i]+"</small>"
}
}else{
tempTag = "<small>暂无</small>";
}
$('#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 + "<font>%</font>")
$('#incrementValue').html(resultsMap.increment + "<font>万</font>");
}else if(resultsMap.rate < 0 && resultsMap.increment < 0){
$('#rateTre').addClass("down");
$('#incrementTre').addClass("down");
$('#rateValue').html(resultsMap.rate + "<font>%</font>")
$('#incrementValue').html(resultsMap.increment + "<font>万</font>");
}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 + "<i class='icon icon-right icon-right01'></i>");
//如果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 + "<i class='icon icon-right icon-right01'></i>");
//如果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+"%");
//全局变量赋值
_evalDate = _houseInfo.evalDate;
totalPricePart = resultsMap.totalPricePart1;
//调用构造数据方法
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 += '<div class="topicTitle" style="position:relative;">挂牌参考';
htmlGuaPai += '<div class="content-block"><div class="buttons-row theme">';
if(resultsMap.houses!=null && resultsMap.houses.length>0){
htmlGuaPai += '<a href="#tabListing1" class="tab-link button active">周边</a>';
}
if(resultsMap.disHouses!=null && resultsMap.disHouses.length>0){
if(resultsMap.houses!=null && resultsMap.houses.length>0){
htmlGuaPai += '<a href="#tabListing2" class="tab-link button">本小区</a>';
}else{
htmlGuaPai += '<a href="#tabListing2" class="tab-link button active">本小区</a>';
}
}
htmlGuaPai += '</div></div></div><div class="tabs">';
if(resultsMap.houses!=null && resultsMap.houses.length>0){
htmlGuaPai += '<div id="tabListing1" class="tab active"><div class="list-block media-list"><ul>';
for(var i in resultsMap.houses){
htmlGuaPai += '<li><a class="item-content"><div class="item-inner"><div class="item-title-row">';
htmlGuaPai += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.houses[i].district_name+"</span><span class='c6 c6a'>"+resultsMap.houses[i].area+"㎡</span></div>";
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+"元/㎡";
htmlGuaPai += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div><div class='item-title-row'>";
htmlGuaPai += "<div class='item-title'><span>"+resultsMap.houses[i].room+"室"+resultsMap.houses[i].hall+"厅/"+resultsMap.houses[i].direction+"/"+resultsMap.houses[i].fitment+"</span></div>";
htmlGuaPai += "<div class='item-after''><span>"+tempAvgPrice+"</span></div></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
}
if(resultsMap.disHouses!=null && resultsMap.disHouses.length>0){
if(resultsMap.houses!=null && resultsMap.houses.length>0){
htmlGuaPai += '<div id="tabListing2" class="tab"><div class="list-block media-list"><ul>';
}else{
htmlGuaPai += '<div id="tabListing2" class="tab active"><div class="list-block media-list"><ul>';
}
for(var i in resultsMap.disHouses){
htmlGuaPai += '<li><a class="item-content"><div class="item-inner"><div class="item-title-row">';
htmlGuaPai += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.disHouses[i].districtName+"</span><span class='c6 c6a'>"+resultsMap.disHouses[i].area+"㎡</span></div>";
var tempTotalPrice = resultsMap.disHouses[i].totalPrice == 0?"暂无":(parseFloat(resultsMap.disHouses[i].totalPrice)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.disHouses[i].avgPrice == 0?"暂无":resultsMap.disHouses[i].avgPrice+"元/㎡";
htmlGuaPai += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div><div class='item-title-row'>";
htmlGuaPai += "<div class='item-title'><span>"+resultsMap.disHouses[i].room+"室"+resultsMap.disHouses[i].hall+"厅/"+resultsMap.disHouses[i].direction+"/"+resultsMap.disHouses[i].fitment+"</span></div>";
htmlGuaPai += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
}
htmlGuaPai += '</div>';
$('#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 += '<div class="topicTitle" style="position:relative;">成交情况';
htmlChengJiao += '<div class="content-block"><div class="buttons-row theme">';
if(resultsMap.sells!=null && resultsMap.sells.length>0){
htmlChengJiao += '<a href="#tabDeal1" class="tab-link button active">周边</a>';
}
if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){
if(resultsMap.sells!=null && resultsMap.sells.length>0){
htmlChengJiao += '<a href="#tabDeal2" class="tab-link button">本小区</a>';
}else{
htmlChengJiao += '<a href="#tabDeal2" class="tab-link button active">本小区</a>';
}
}
htmlChengJiao += '</div></div></div><div class="tabs">';
if(resultsMap.sells!=null && resultsMap.sells.length>0){
htmlChengJiao += '<div id="tabDeal1" class="tab active"><div class="list-block media-list"><ul>';
for(var i in resultsMap.sells){
htmlChengJiao += '<li><a class="item-content"><div class="item-inner"><div class="item-title-row">';
htmlChengJiao += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.sells[i].district_name+"</span></div>";
var tempTotalPrice = resultsMap.sells[i].total_price == 0?"暂无":(parseFloat(resultsMap.sells[i].total_price)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.sells[i].avg_price == 0?"暂无":resultsMap.sells[i].avg_price+"元/㎡";
var tradeDate = resultsMap.sells[i].trade_date == null?"暂无":formatTime(resultsMap.sells[i].trade_date)+"签约";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
var direction_floor = (resultsMap.sells[i].direction == undefined || resultsMap.sells[i].direction == "")?"":resultsMap.sells[i].direction;
direction_floor += (resultsMap.sells[i].floor == undefined || resultsMap.sells[i].floor == "")?"":resultsMap.sells[i].floor + "层";
htmlChengJiao += "<div class='item-title-row'><div class='item-title'><span>"+direction_floor+"</span></div>";
htmlChengJiao += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div>";
htmlChengJiao += "<div class='item-subtitle'><span class='tag'><small>"+tradeDate+"</small></span></div></div></a></li>";
}
htmlChengJiao += '</ul></div></div>';
}
if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){
if(resultsMap.sells!=null && resultsMap.sells.length>0){
htmlGuaPai += '<div id="tabDeal2" class="tab"><div class="list-block media-list"><ul>';
}else{
htmlGuaPai += '<div id="tabDeal2" class="tab active"><div class="list-block media-list"><ul>';
}
for(var i in resultsMap.disSellHouses){
htmlChengJiao += '<li><a class="item-content"><div class="item-inner"><div class="item-title-row">';
htmlChengJiao += "<div class='item-title'><span class='c3 c3a'>"+resultsMap.disSellHouses[i].name+"</span></div>";
var tempTotalPrice = resultsMap.disSellHouses[i].totalPrice == 0?"暂无":(parseFloat(resultsMap.disSellHouses[i].totalPrice)/10000).toFixed(2)+"万";
var tempAvgPrice = resultsMap.disSellHouses[i].avgPrice == 0?"暂无":resultsMap.disSellHouses[i].avgPrice+"元/㎡";
var tradeDate = resultsMap.disSellHouses[i].tradeDate == null?"暂无":formatTime(resultsMap.disSellHouses[i].tradeDate)+"签约";
htmlChengJiao += "<div class='item-after'><em>"+tempTotalPrice+"</em></div></div>";
var direction_floor = (resultsMap.disSellHouses[i].direction == undefined || resultsMap.disSellHouses[i].direction == "")?"":resultsMap.disSellHouses[i].direction;
direction_floor += (resultsMap.disSellHouses[i].floor == undefined || resultsMap.disSellHouses[i].floor == "")?"":resultsMap.disSellHouses[i].floor + "层";
htmlChengJiao += "<div class='item-title-row'><div class='item-title'><span>"+direction_floor+"</span></div>";
htmlChengJiao += "<div class='item-after'><span>"+tempAvgPrice+"</span></div></div>";
htmlChengJiao += "<div class='item-subtitle'><span class='tag'><small>"+tradeDate+"</small></span></div></div></a></li>";
}
htmlGuaPai += '</ul></div></div>';
}
htmlChengJiao += '</div>';
$('#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;
//初始化数据
getAnalysisDetail();
//初始化图表
loadingChart($(".avgPriceTrend").find("a.active").attr("data-id"));
}
+1 -1
View File
@@ -631,7 +631,7 @@ function gotoRentManager(){
//出售分析
function gotoSaleAnalysis(){
clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId},function(){})
clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId, city: oriCity, region: oriRegion, name: oriName},function(){})
}
function gotoChangeHouse(){
+19 -4
View File
@@ -34,6 +34,9 @@
<!--<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>-->
<button class="button button-link button-nav pull-right" id="shareButton" onclick="shareHref()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">房产行情</h1>
</header>
<div class="content">
@@ -1211,11 +1214,17 @@ $.config = {router: false}
<script type="text/javascript" src="../component/cityChooseComponent.js"></script>
<script type="text/javascript" src="../../js/echarts.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/highcharts-4.2.3.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/city.js" ></script>
<script>
var shareUrl = BASE_PATH+"/house/cityShare?city=全国";
var sharehrefTitle = "房产行情,小区价格,房租信息全掌握";
var sharehrefDes = "客观里面请!";
//var shareId='全国';
var picUrl = '_www/img/default_share.png';
var date = new Date();
var year = date.getFullYear()+'年';
var month = date.getMonth()+1+'月';
@@ -1390,8 +1399,7 @@ $.config = {router: false}
$("#citySearchInp").bind('keyup', function() {
search();
});
updateSerivces();
}
//加载首页全国数据
@@ -1485,6 +1493,12 @@ $(document).ready(function () {
});
$("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){
shareUrl = BASE_PATH+"/house/cityShare?city="+$(this).text();
if($(this).text()=="添加"){
$("#shareButton").hide();
}else{
$("#shareButton").show();
}
$("#tabCityDiv a").removeClass("active");
$("#contentTabDiv > .tab").removeClass("active");
$("#cityInfo").hide()
@@ -1493,7 +1507,8 @@ $("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){
function clickCity(val){
shareUrl = BASE_PATH+"/house/cityShare?city="+val;
$("#shareButton").show();
city = val;
plus.nativeUI.showWaiting();
@@ -63,7 +63,7 @@
</div>
</div>
<div class="page page-current" id="noData" style="display: none;">
<header class="bar bar-nav">
<header class="bar bar-nav barBorder">
<h1 class="title">房产评估</h1>
</header>
<div class="loadingBgDiv">
+43 -527
View File
@@ -7,6 +7,7 @@
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="../../css/sm.css">
@@ -28,24 +29,24 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<h1 class="title">出售分析测试</h1>
<h1 class="title">出售分析</h1>
</header>
<div class="content">
<div class="content" id="houseInfo" v-cloak>
<div class="list-block media-list mb05 topList">
<ul>
<li>
<a class="item-content">
<div class="item-inner item-inner01">
<div class="item-title-row">
<div class="item-title"><label><b>龙盛佳苑</b></label><span class="tag"><small>出租</small></span></div>
<div class="item-after"><em>391.45万</em></div>
<div class="item-title"><label><b>{{name}}</b></label><span class="tag" id="liveStatus">{{liveStatus}}</span></div>
<div class="item-after"><em>{{totalPrice}}</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室1厅&nbsp;&nbsp;60m&nbsp;&nbsp;1/6层</span></div>
<div class="item-after"><span>2018/02/08估值</span></div>
<div class="item-title"><span>{{houseRoomNum}}&nbsp;&nbsp;{{houseArea}}&nbsp;&nbsp;{{floorHeight}}</span></div>
<div class="item-after"><span>{{evalDate}}</span></div>
</div>
<div class="item-subtitle">
<span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span>
<span class="tag" id="moreTag"></span>
</div>
</div>
</a>
@@ -55,13 +56,8 @@
<div class="topic">
<div class="topicContent">
<div class="topicTitle01 alert-text-title02">交易活跃度:<em class="riskScore03">良好</em><i class="icon icon-note"></i></div>
<div class="topicTitle01 alert-text-title02">交易活跃度:<em class="" id="riskScore"></em><i class="icon icon-note"></i></div>
<div class="assetRisk">
<!--<div class="rankingBox dn">
<div class="ranking">
<font style="padding-left:0;margin-left:-1px;"><i class="riskScore03" style="width:72%;"></i></font>
</div>
</div>-->
<p class="p01"><span style="margin-left:-3px;margin-right:60px;">0</span><span style="margin-right:57px;">26</span><span style="margin-right:56px;">38</span><span style="margin-right:47px;">70</span><span style="margin-right:0;">100</span></p>
<font><i class="riskScore01"></i><i class="riskScore02"></i><i class="riskScore03"></i><i class="riskScore04"></i></font>
<p><span>很差</span><span>较差</span><span>良好</span><span>很好</span></p>
@@ -72,49 +68,49 @@
<div class="topic">
<div class="topicTitle">增长率及收益</div>
<div class="topicContent">
<div class="rateBox01">
<div class="rateBox01" id="showRateBox01">
<div class="topicContent_bottom01">
<span class="open-modal01">看看这套房子为我赚了多少<i class="icon icon-right icon-right01"></i></span>
</div>
</div>
<div class="rateBox02 dn">
<div class="rateBox02 dn" id="showRateBox02">
<div class="topicContent_top topicContent_top01">
<div class="left">
<p class="up">
<p class="" id="rateTre">
<i></i>
<em>11.84<font>%</font></em>
<em id="rateValue"></em>
</p>
<p><span>年增长率</span></p>
</div>
<div class="right">
<p class="up">
<p class="" id="incrementTre">
<i></i>
<em>41.45<font>万</font></em>
<em id="incrementValue"></em>
</p>
<p><span>房屋已升值</span></p>
</div>
</div>
<a class="adBox" href=""><p>房子能卖400万!XX银行月月高理财年化5.6%起(每年收益15.68万起),查看详情<i class="icon icon-right icon-right01"></i></p></a>
<a class="adBox" id="showAdBox1" style="display: none;" href="#"><p id="showAdBox1Content"></p></a>
</div>
</div>
</div>
<div class="topic">
<div class="topicContent">
<div class="topicTitle01">龙盛佳苑在上海市:</div>
<div class="topicTitle01">{{name}}在{{city}}:</div>
<div class="topicContent_bottom" style="border-bottom:solid 1px #e7e7e7;padding-bottom:0.5rem;">
<p style="margin-bottom:20px;">涨幅(近12个月)超过了<em>69.7%</em>的住宅</p>
<font><i style="width:69.7%;"></i></font>
<p style="margin-bottom:20px;">涨幅(近12个月)超过了<em>{{roseRanking}}%</em>的住宅</p>
<font><i id="roseRankingPercent" style=""></i></font>
<small class="rankingNote"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">0%</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">100%</span></small>
</div>
<div class="topicContent_bottom">
<p>均价超过了<em>64.14%</em>的住宅</p>
<div class="slider_note" style="left:50.14%;">
<p>均价超过了<em>{{avgpriceRanking}}%</em>的住宅</p>
<div class="slider_note" id="sliderNotePercent" style="">
<img src="../../images/arrow_note_down.png">
<span>65,241元/㎡</span>
<span>{{price}}元/㎡</span>
</div>
<font><i style="width:64.14%;"></i></font>
<small class="rankingNote" style="height:45px;"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">相对最低<br>9,290元/㎡</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">相对最高<br>194,953元/㎡</span></small>
<font><i id="curRatePercent" style=""></i></font>
<small class="rankingNote" style="height:45px;"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">相对最低<br>{{minSellPrice}}</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">相对最高<br>{{maxSellPrice}}</span></small>
</div>
</div>
</div>
@@ -122,10 +118,10 @@
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
<div class="buttons-row theme">
<a href="#tabChartAvg1" class="tab-link button active">半年</a>
<a href="#tabChartAvg2" class="tab-link button">一年</a>
<a href="#tabChartAvg3" class="tab-link button">三年</a>
<div class="buttons-row theme avgPriceTrend">
<a href="#tab1" data-id="1" class="tab-link button active">半年</a>
<a href="#tab2" data-id="2" class="tab-link button">一年</a>
<a href="#tab3" data-id="3" class="tab-link button">三年</a>
</div>
</div>
</div>
@@ -138,148 +134,15 @@
<div class="topicTitle">挂牌建议</div>
<div class="topicContent" style="padding-top:0;">
<div class="topicContent_center02">
<p><label>总价:</label><em>352.3万 - 391.45万</em></p>
<p><span>单价:5.87万/㎡ - 6.52万/㎡</span></p>
<p><label>总价:</label><em>{{minAndMaxTotalPrice}}</em></p>
<p><span>单价:{{minAndMaxPrice}}</span></p>
</div>
<a class="adBox" href=""><p>房子能卖400万!XX银行月月高理财年化5.6%起(每年收益15.68万起),查看详情<i class="icon icon-right icon-right01"></i></p></a>
<a class="adBox" id="showAdBox2" style="display: none;" href="#"><p id="showAdBox2Content"></p></a>
</div>
</div>
<div class="topic">
<div class="topicTitle" style="position:relative;">挂牌参考
<div class="content-block">
<div class="buttons-row theme">
<a href="#tabListing1" class="tab-link button active">周边</a>
<a href="#tabListing2" class="tab-link button">本小区</a>
</div>
</div>
</div>
<div class="tabs">
<div id="tabListing1" class="tab active">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">大华爱宅</span><span class="c6 c6a">45㎡</span></div>
<div class="item-after"><em>60万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>1室1厅/南北/中等装修</span></div>
<div class="item-after"><span>13,333元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">大华路869弄小区</span><span class="c6 c6a">61.71㎡</span></div>
<div class="item-after"><em>370万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室1厅/南北/中装</span></div>
<div class="item-after"><span>59,957元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">大华二村三街坊</span><span class="c6 c6a">66㎡</span></div>
<div class="item-after"><em>330万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室1厅/南北/精装修</span></div>
<div class="item-after"><span>50,000元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">文华苑</span><span class="c6 c6a">53.13㎡</span></div>
<div class="item-after"><em>310万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>1室1厅/南北/精装</span></div>
<div class="item-after"><span>58,347元/㎡</span></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
<div id="tabListing2" class="tab">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span><span class="c6 c6a">62.35㎡</span></div>
<div class="item-after"><em>452万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室1厅/南/精装</span></div>
<div class="item-after"><span>72,493元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span><span class="c6 c6a">81㎡</span></div>
<div class="item-after"><em>386万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室2厅/南北/精装修</span></div>
<div class="item-after"><span>47,654元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span><span class="c6 c6a">72㎡</span></div>
<div class="item-after"><em>360万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室2厅/南北/豪华装修</span></div>
<div class="item-after"><span>50,000元/㎡</span></div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span><span class="c6 c6a">82㎡</span></div>
<div class="item-after"><em>400万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>2室1厅/北向/豪华装修</span></div>
<div class="item-after"><span>48,780元/㎡</span></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="topic" id="showTopic1" style="display: none;">
<!-- 构造挂牌参考数据 -->
</div>
<div class="list-block">
@@ -287,178 +150,36 @@
<li class="item-content">
<div class="item-inner">
<div class="item-title">周边房产中介</div>
<div class="item-after"><em style="color:#F18D00;">50</em>家</div>
<div class="item-after"><em style="color:#F18D00;">{{agencyCount}}</em>家</div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-title">知名中介:</div>
<div class="item-after"><em style="color:#F18D00;">21</em>家</div>
<div class="item-after"><em style="color:#F18D00;">{{famousAgency}}</em>家</div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-title">其他中介:</div>
<div class="item-after"><em style="color:#F18D00;">29</em>家</div>
<div class="item-after"><em style="color:#F18D00;">{{otherAgency}}</em>家</div>
</div>
</li>
<li class="topic" style="border-top:none;">
<div class="topicContent">
<div class="topicContent_bottom">
<p style="margin-bottom:20px;margin-top:0;color:#333;">周边中介量在上海排名:<em style="float:right;">35%</em></p>
<font><i style="width:35%;"></i></font>
<small class="rankingNote"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">最低:0</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">最高:150</span></small>
<p style="margin-bottom:20px;margin-top:0;color:#333;">周边中介量在{{city}}排名:<em style="float:right;">{{agencyLevel}}%</em></p>
<font><i style="" id="agencyLevelPercent"></i></font>
<small class="rankingNote"><span class="rankingNoteLeft" style="line-height:17px;margin-top:7px;">最低:0</span><span class="rankingNoteRight" style="line-height:17px;margin-top:7px;text-align:right;">最高:{{maxCityAgency}}</span></small>
</div>
</div>
</li>
</ul>
</div>
<div class="topic">
<div class="topicTitle" style="position:relative;">成交情况
<div class="content-block">
<div class="buttons-row theme">
<a href="#tabDeal1" class="tab-link button active">周边</a>
<a href="#tabDeal2" class="tab-link button">本小区</a>
</div>
</div>
</div>
<div class="tabs">
<div id="tabDeal1" class="tab active">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">馨华苑</span></div>
<div class="item-after"><em>540万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>南北</span></div>
<div class="item-after"><span>60,006元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/06/17签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">大华二村</span></div>
<div class="item-after"><em>280万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝南</span></div>
<div class="item-after"><span>59,867元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/06/17签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">文华苑五期</span></div>
<div class="item-after"><em>588万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝南</span></div>
<div class="item-after"><span>52,136元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/06/25签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">大华一村</span></div>
<div class="item-after"><em>290万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝南</span></div>
<div class="item-after"><span>60,732元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/05/31签约</small></span></div>
</div>
</a>
</li>
</ul>
</div>
</div>
<div id="tabDeal2" class="tab">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span></div>
<div class="item-after"><em>249万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝北</span></div>
<div class="item-after"><span>51,875元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/09/20签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span></div>
<div class="item-after"><em>250万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝南</span></div>
<div class="item-after"><span>53,191元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/07/29签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span></div>
<div class="item-after"><em>260万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>朝南</span></div>
<div class="item-after"><span>54,166元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/07/28签约</small></span></div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><span class="c3 c3a">龙盛佳苑</span></div>
<div class="item-after"><em>250万</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><span>南北</span></div>
<div class="item-after"><span>56,818元/㎡</span></div>
</div>
<div class="item-subtitle"><span class="tag"><small>2017/07/11签约</small></span></div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="topic" id="showTopic2" style="display: none;">
<!-- 构造成交情况数据 -->
</div>
</div>
</div>
</div>
@@ -488,7 +209,7 @@
<div class="item-title-row">
<div class="item-title">购入价格</div>
<div class="item-after">
<input type="text" id="input_price" class="textAlignLeft" placeholder="请输入">
<input type="text" id="input_price" class="textAlignLeft" onkeyup="value=value.replace(/[^\d]/g, '')" placeholder="请输入">
<label>万元</label>
</div>
</div>
@@ -527,213 +248,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/highcharts-4.2.3.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/saleAnalysis/saleAnalysis.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
/* 增长率及收益 */
$(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: '<header class="bar bar-nav bar-nav01 bar-nav01a">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">购入时间</h1>\
</header>'
});
/* 说明-交易活跃度 */
$(document).on('click','.alert-text-title02', function () {
$.alert('交易活跃度是根据房产的价值、周边配套、供需关系等情况来衡量,能否在市场中快速交易变现的评级。', '交易活跃度');
});
/* button状态切换 */
$(".content-block .button").on("click", function () {
$(this).parent().children().removeClass("active");
$(this).addClass("active");
});
/* 均价走势 */
function yearAvgPrice(){
var categories = new Array();
var series = new Array();
var o = new Object();
o.name = '龙盛佳苑';
var odata = new Array();
o.data = odata
series.push(o);
var o2 = new Object();
o2.name = '上海';
var o2data = new Array();
var o3 = new Object();
o3.name = '静安';
var o3data = new Array();
odata.push(46000)
o2data.push(50400)
o3data.push(52800)
categories.push('2017-02')
odata.push(47000)
o2data.push(50600)
o3data.push(52900)
categories.push('2017-03')
odata.push(47400)
o2data.push(50300)
o3data.push(52700)
categories.push('2017-04')
odata.push(49000)
o2data.push(50200)
o3data.push(55200)
categories.push('2017-05')
odata.push(49400)
o2data.push(50800)
o3data.push(56100)
categories.push('2017-06')
odata.push(49600)
o2data.push(51900)
o3data.push(56900)
categories.push('2017-07')
odata.push(48400)
o2data.push(53100)
o3data.push(59400)
categories.push('2017-08')
odata.push(52200)
o2data.push(51200)
o3data.push(62400)
categories.push('2017-09')
odata.push(54900)
o2data.push(56200)
o3data.push(65600)
categories.push('2017-10')
odata.push(57400)
o2data.push(57000)
o3data.push(66800)
categories.push('2017-11')
odata.push(54800)
o2data.push(56700)
o3data.push(66200)
categories.push('2017-12')
odata.push(55000)
o2data.push(58300)
o3data.push(66000)
categories.push('2018-01')
o3.data = o3data
series.push(o3);
o2.data = o2data
series.push(o2);
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: {
radius: 3, //曲线点半径,默认是4
symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
}
}
},
series: series,
credits: {
enabled: false
}
})
}
yearAvgPrice();
</script>
</body>
</html>
+1 -1
View File
@@ -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})
}
+3 -5
View File
@@ -1556,13 +1556,10 @@ function initNews(page){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
}
if(page==1 && response.data.data.list.length == 0){
if(page==1){
todayDeployFlag = true;
$("#todayNews").hide();
}else{
$("#todayNews").show();
}
for(var i in response.data.data.list){
dataObj.push(response.data.data.list[i])
if(dataObj[i].todayDeploy && todayDeployFlag){
@@ -1876,6 +1873,7 @@ function addItems(number, lastIndex) {
html += '<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i>';
}
html += '</span></div><div class="card-footer" style="margin-top:-0.75rem;">';
if(dataObj[i].recommendCityYoy){
html += '<span>近1年涨跌幅:';
if(dataObj[i].recommendCityYoy>0){