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

This commit is contained in:
尹吉欢
2018-03-15 11:58:58 +08:00
+82 -19
View File
@@ -105,7 +105,7 @@
</div>
<div class="content-block-title" style="font-size:1.5rem;" id="todayDate">{{todayDate}}</div>
<div class="card cardInfo cardInfo01">
<!--<div class="card cardInfo cardInfo01">
<img src="images/cardInfoImg01.png">
<div class="cardInfoMask"></div>
<div class="card-header">限购先售的时间,适合买房吗?</div>
@@ -186,7 +186,7 @@
<em>V.S</em>
</div>
</div>
</div>
</div>-->
<div class="selectContainer dn">
<div class="selectBox row">
@@ -1544,8 +1544,8 @@ function getPosition(){
);
}
/* 获取#region字数,截取#region前4字,并添加... */
city="上海"
init();
/*city="上海"
init();*/
function init(){
//显示附近地址
var nearAddressParam = address;
@@ -1570,7 +1570,6 @@ function init(){
}
})
.then(function (response) {
alert("aa");
new Vue({
el: '#baseInfo',
data: {
@@ -1624,30 +1623,94 @@ function init(){
console.log(error);
});
//资讯列表
/*axios.get(BASE_PATH+"/rest/news/list", {
axios.get(BASE_PATH+"/rest/news/list", {
params: {
city: cityParam,
page:1
}
})
.then(function (response) {
//附近小区列表
var html = '<div class="cardNearbyWin" id="nearbyDistrictList">';
for(var i in response.data.data.dtos){
html += '<div class="card cardNearby"><div class="card-header">'+response.data.data.dtos[i].name+
'</div><div class="card-content"><div class="card-content-inner">'+response.data.data.dtos[i].avgPrice+'元/㎡</div></div><div class="card-footer">'+
'距您'+response.data.data.dtos[i].distance+'m</div></div>';
}
html += '</div>';
$("#nearDistricts").html(html);
$("#nearbyDistrictList").css("width",(7.5*response.data.data.dtos.length)+"rem");
var html = '';
for(var i in response.data.data.list){
if(response.data.data.list[i].type=="专题"){
html += '<div class="card cardInfo cardInfo01">'+
'<img src='+response.data.data.list[i].coverImg+'>'+
'<div class="cardInfoMask"></div>'+
'<div class="card-header">'+response.data.data.list[i].title+'</div>'+
'<div class="card-footer">'+
'<span style="margin-right:1.5rem;">'+
'<i class="icon icon-praise-white"></i>2022人'+
'</span>'+
/*'<span><i class="icon icon-comments-white"></i>1245条</span>'+*/
'</div>'+
'</div>';
}
/*if(response.data.data.list[i].type=="房源"){
html += '<div class="card cardInfo cardInfo01 cardInfo01a">'+
'<img src='+response.data.data.list[i].coverImg+'>'+
'<div class="cardInfoMask"></div>'+
'<div class="card-header">'+response.data.data.list[i].title+'<span>今日推荐</span></div>'+
'<div class="card-content">'+
'<div class="card-content-inner"><span>浦东-周康</span></div>'+
'</div>'+
'<div class="card-footer">'+
'<span><em><strong>75000</strong>元/㎡</em></span>'+
'<span class="tag"><small>在售</small><small>住宅</small><small>轨交房</small><small>学区</small><small>旅游城市</small></span>'+
'</div>'+
'</div>';
}*/
if(response.data.data.list[i].type=="活动"){
html += '<div class="card cardInfo cardInfo01 cardInfo01b">'+
'<img src='+response.data.data.list[i].coverImg+'>'+
'<div class="cardInfoMask"></div>'+
'<div class="card-header">'+response.data.data.list[i].title+'</div>'+
'<div class="card-footer">'+
'<span>'+
response.data.data.list[i].introduction+
'</span>'+
'</div>'+
'</div>';
}
/*if(response.data.data.list[i].type=="城市"){
<div class="card cardInfo cardInfo01 cardInfo01a">
<img src="images/cardInfoImg04.png">
<div class="cardInfoMask"></div>
<div class="card-header"></div>
<div class="card-content">
<div class="card-content-inner"><span style="font-size:2rem;line-height:2rem;font-weight:bold;">上海</span></div>
</div>
<div class="card-footer">
<span><em style="color:#666;">潜力指数:<strong>80</strong></em></span>
<span class="tag"><small>一线</small><small>魔都</small><small>古城</small><small>文明城</small><small>旅游城市</small></span>
</div>
</div>
}*/
if(response.data.data.list[i].type=="新闻"){
html += '<div class="card cardInfo cardInfo02"><div class="card-content"><div class="list-block media-list">'+
'<ul><li class="item-content"><div class="item-media">'+
'<img src='+response.data.data.list[i].coverImg+'></div><div class="item-inner">'+
'<div class="item-title-row"><div class="item-title">'+response.data.data.list[i].title+'</div></div>'+
'<div class="item-subtitle"><font>'+response.data.data.list[i].introduction+'</font></div>'+
'<div class="item-subtitle"><span style="margin-right:0.75rem;"><i class="icon icon-praise-grey"></i>2022人</span>'+
/*'<span><i class="icon icon-comments-grey"></i>1245条</span>'+*/
'</div></div></li></ul></div></div></div>';
}
if(response.data.data.list[i].type=="投票"){
html += '<div class="card cardInfo cardInfo03"><div class="card-header">'+response.data.data.list[i].title+
'</div><div class="card-content"><div class="card-content-inner row"><div class="vote01 col-50">'+
'<i class="icon icon-light-grey icon-light-red"></i><span>同意</span>'+
'<font style="width:62%;"></font><label>198票&nbsp;&nbsp;62%</label></div>'+
'<div class="vote02 col-50"><i class="icon icon-light-grey"></i><span>反对</span>'+
'<font style="width:38%;"></font><label>121票&nbsp;&nbsp;38%</label></div><em>V.S</em></div></div></div>';
}
}
$("#todayDate").append(html);
})
.catch(function (error) {
console.log(error);
});*/
});
}