This commit is contained in:
xuhe@fangjia.com
2018-04-02 18:57:48 +08:00
parent 8386a8f72b
commit ae7db80789
3 changed files with 139 additions and 233 deletions
+4 -1
View File
@@ -298,8 +298,9 @@ em.down{color:#88D053;}
.popup-about02 .list-block.historyList{margin-top:-1px;}
.popup-about02 .list-block.historyList .searchHistory{padding-top:0;}
.newCss ul{padding:0.75rem;padding-top:0;padding-left:0.25rem;overflow:hidden;}
.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;}
.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;font-size:0.65rem;color:#333;}
.newCss ul li span{font-size:0.65rem;color:#333;}
.newCss ul li a{font-size:0.65rem;color:#333;}
.newCss ul:before,.popup-about02 .list-block.newCss ul:after{height:0;}
.content-padded + .newCss ul{padding-bottom:0;}
@@ -1211,6 +1212,8 @@ input[type=range]::-webkit-slider-thumb {
.icon-around03:before { content: "\e610"; }
.icon-star:before { content: ""; }
/* 自适应 */
@media(max-width:414px){
.list-block .item-title span.c3a{max-width:220px;}
+77 -212
View File
@@ -47,7 +47,10 @@
<div class="item-title-row">
<div class="item-title">城<small class="spacing">&nbsp;</small>市</div>
<div class="item-after">
<input type="text" id="input_city" class="textAlignLeft open-about01" placeholder="请选择城市" readonly="readonly" value="上海">
<input type="hidden" name="region">
<input type="hidden" name="address">
<input name ="cityAddress" type="hidden">
<input type="text" id="input_city" class="textAlignLeft open-about01" placeholder="请选择城市" readonly="readonly">
</div>
</div>
</div>
@@ -59,7 +62,7 @@
<div class="item-title-row">
<div class="item-title">房屋地址</div>
<div class="item-after">
<input type="text" id="input_address" class="textAlignLeft open-about02" placeholder="请选择房屋地址">
<input type="text" id="input_address" class="textAlignLeft open-about02" placeholder="请选择房屋地址" readonly="readonly">
</div>
</div>
</div>
@@ -151,6 +154,13 @@
<a href="#tabCity2" class="tab-link button">按城市等级</a>
</div>
</div>
<div class="content-block content-block01 content dn" style="top:66px;z-index:100;" id="selectContainer">
<div class="container" style="top:0;">
<div class="city" style="width:100%;">
<div class="city-list"></div>
</div>
</div>
</div>
<div class="tabs">
<div id="tabCity1" class="tab active">
<div class="content-block content-block01 content">
@@ -165,8 +175,8 @@
<div class="city-list01">
<span class="city-letter" id="Hot">热门城市</span>
<div>
<p class="close-popup collectionCity">北京<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity active">上海<i class="icon-collection03"></i></p>
<p class="close-popup">北京</i></p>
<p class="close-popup">上海</i></p>
<p class="close-popup">广州</p>
</div>
<div>
@@ -184,7 +194,7 @@
<div class="city">
<div class="city-list"><span class="city-letter" id="A1">A</span>
<p class="close-popup">阿坝州</p>
<p class="close-popup collectionCity">阿克苏<i class="icon-collection03"></i></p>
<p class="close-popup">阿克苏</p>
<p class="close-popup">阿拉尔</p>
<p class="close-popup">阿勒泰</p>
<p class="close-popup">阿里</p>
@@ -626,8 +636,8 @@
<div class="city-list">
<span class="city-letter" id="City1">一线城市</span>
<div>
<p class="close-popup collectionCity">北京<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity active">上海<i class="icon-collection03"></i></p>
<p class="close-popup">北京</p>
<p class="close-popup">上海</p>
<p class="close-popup">广州</p>
<p class="close-popup">深圳</p>
</div>
@@ -924,7 +934,7 @@
<p class="close-popup">陇南</p>
<p class="close-popup">吴忠</p>
<p class="close-popup">晋城</p>
<p class="close-popup collectionCity">阿克苏<i class="icon-collection03"></i></p>
<p class="close-popup">阿克苏</p>
<p class="close-popup">喀什</p>
<p class="close-popup">昌吉</p>
<p class="close-popup">楚雄</p>
@@ -1020,144 +1030,21 @@
<input type="search" id="districtName" placeholder="请输入小区名或地址">
</div>
</div>
<div class="content-block dn" id="notFound" style="margin-top:50%;">
<p style="text-align:center;">没有找到相关的小区</p>
<p><a class="button button-big theme open-modal" id="notFound_btn" style="font-size:0.8rem;">没搜到?立刻告诉我们</a></p>
<p style="text-align:center;text-decoration:underline;margin-top:2rem;"><a class="close-popup">返回</a></p>
</div>
</div>
<div class="content-block content-block01 content">
<div class="container">
<!--
<div class="list-block media-list aroundList">
<div class="searchHistory"><i class="icon icon-near"></i>附近小区</div>
<div>
<ul>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>龙盛佳苑</font><br>
<small>上海市静安区沪太路1329弄</small>
</div>
<div class="item-after">8m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>米扬公寓</font><br>
<small>上海市宝山区沪太路1598号</small>
</div>
<div class="item-after">175m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>大华阳城花园一期</font><br>
<small>上海市静安区沪太路1589号</small>
</div>
<div class="item-after">201m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>大华阳城花园七期</font><br>
<small>上海市静安区阳城路433号</small>
</div>
<div class="item-after">201m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>沪太路1700弄小区</font><br>
<small>上海市宝山区沪太路1700弄</small>
</div>
<div class="item-after">267m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>浦联佳苑</font><br>
<small>上海市静安区阳城路388弄</small>
</div>
<div class="item-after">269m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>大华阳城花园</font><br>
<small>上海市静安区阳城路283弄</small>
</div>
<div class="item-after">276m</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content close-popup">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">
<font>大华阳城花园六期</font><br>
<small>上海市静安区沪太路1580号</small>
</div>
<div class="item-after">276m</div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
-->
<div class="list-block media-list aroundList newCss dn">
<div class="searchHistory" id="searchAroundDiv">附近小区</div>
<div id="aroundList">
<ul>
<li><span class="close-popup">龙盛佳苑</span></li>
<li><span class="close-popup">米扬公寓</span></li>
<li><span class="close-popup">大华阳城花园一期</span></li>
<li><span class="close-popup">大华阳城花园七期</span></li>
<li><span class="close-popup">沪太路1700弄小区</span></li>
<li><span class="close-popup">浦联佳苑</span></li>
<li><span class="close-popup">大华阳城花园</span></li>
<li><span class="close-popup">大华阳城花园六期</span></li>
</ul>
</div>
</div>
<div class="list-block media-list hotList newCss">
<div class="list-block media-list hotList newCss">
<div class="searchHistory" id="searchHotDiv">热门小区</div>
<div id="hotList">
<ul>
<li><span class="close-popup">龙盛佳苑</span></li>
<li><span class="close-popup">水韵华庭</span></li>
<li v-for="dist in hotDists"><a v-bind:data-name="dist.name" v-bind:data-region="dist.region" v-bind:data-city="dist.city">{{dist.name}}</a></li>
</ul>
</div>
</div>
@@ -1165,39 +1052,28 @@
<div class="searchHistory" id="searchHistoryDiv">历史记录<a id="clearSearchHistory"></a></div>
<div id="districtList">
<ul>
<li><span class="close-popup">龙盛佳苑</span></li>
<li><span class="close-popup">水韵华庭</span></li>
<li><span class="close-popup">中远两湾城</span></li>
<li><span class="close-popup">康宁坊</span></li>
<li><span class="close-popup">雅鹿新苑</span></li>
<li v-for="(history,index) in histories" @click="openHistoryDetail(index)">{{history.name}}</li>
</ul>
</div>
</div>
<div class="list-block media-list searchList dn">
<div id="searchList">
<ul>
<li v-for="(searchDist,index) in searchDistricts" @click="openDistrictDetail(index)">
<a class="item-link item-content close-popup" v-bind:data-name="searchDist.name" v-bind:data-region="searchDist.region" v-bind:data-city="searchDist.city" v-bind:data-address="searchDist.address">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">{{searchDist.name}}<br><small>{{searchDist.city}}{{searchDist.region}}{{searchDist.address}}</small></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<!--
<div class="popup popup-about popup-about02">
<div class="bar">
<div class="searchbar row">
<a class="col-5 close-popup"><span class="icon icon-left"></span></a>
<div class="search-input col-95">
<label class="icon icon-search" for="search"></label>
<input type="search" id="districtName" placeholder="请输入小区名或地址">
</div>
</div>
</div>
<div class="content-block content-block01 content">
<div class="container">
<div class="content-block" style="margin-top:50%;">
<p style="text-align:center;">没有找到相关的小区</p>
<p><a class="button button-big theme open-modal" id="notFound_btn" style="font-size:0.8rem;">没搜到?立刻告诉我们</a></p>
<p style="text-align:center;text-decoration:underline;margin-top:2rem;"><a class="close-popup">返回</a></p>
</div>
</div>
</div>
</div>
-->
<div class="popup popup-about popup-about03">
<div class="bar">
@@ -1306,63 +1182,52 @@ Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/sm.js" charset="utf-8"></script>
<script type="text/javascript" src="../../config.js"></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/city-app.js?version=${version!}' charset='utf-8'></script>
<script type='text/javascript' src='../../js/searchDistrict-add.js?' charset='utf-8'></script>
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
//扩展API加载完毕,现在可以正常调用扩展API
function onPlusReady(){
var city_map = localStorage.getItem("init_city");
if(city_map){
$("#input_city").val(city_map)
$(".nowCity").text(city_map)
curCity = city;
city= city;
}else{
$("#input_city").val("上海");
$(".nowCity").text("上海");
}
}
/* 弹出城市选择页面 */
$(document).on("click",".open-about01", function () {
$.popup(".popup-about01");
});
/* 定位城市 */
$("body").on("click", ".letter a", function () {
var s = $(this).html();
$(".popup-about01 .content").scrollTop(0);
$(".popup-about01 .content").scrollTop($("#" + s + "1").offset().top - 106);
});
$("#tabCity1 .content-block01").scroll(function () {
$("#tabCity1 .content-block01 .letter").css("position","absolute");
$("#tabCity1 .content-block01 .letter").css("top", 85 - $("#cityContainer").position().top);
});
/* 获取城市 */
$(".popup-about01 .cityGPS").on("click", function () {
$("#input_city").val($(this).find("p").text());
$(".cityChoice a").text($(this).find("p").text());
$(".popup-about01 p").removeClass("active");
});
$(".popup-about01 p").on("click", function () {
$("#input_city").val($(this).text());
$(".cityChoice a").text($(this).text());
$(".popup-about01 p").removeClass("active");
$(this).addClass("active");
});
/* 弹出房屋地址搜索页面 */
$(document).on("click",".open-about02", function () {
$.popup(".popup-about02");
});
/* #districtName获取焦点时,显示搜索历史 */
$("#districtName").focus(function(){
$(".aroundList").hide();
$(".historyList").show();
});
/* 清空搜索历史 */
$("#clearSearchHistory").click(function(){
$(this).parents(".historyList").hide();
});
function req(city){
city=city.replace("<i></i>","")
$("#input_city").val(city);
}
/* 获取房屋地址 */
$(".popup-about02 ul li").on("click", function () {
$("#input_address").val($(this).find("span").text());
$("#input_address").val($(this).find(".item-title font").text());
});
$("body").delegate("#hotList ul li", "click", function () {
$("#input_address").val($(this).find("a").attr("data-name"));
$("[name=region]").val($(this).find("a").attr("data-region"));
$("[name=name]").val($(this).find("a").attr("data-name"));
$("[name=cityAddress]").val($(this).find("a").attr("data-city"));
$.popup(".popup-about02")
});
/* 选择-房屋类型 */
//$("#input_houseType").picker({
// toolbarTemplate: '<header class="bar bar-nav bar-nav01">\
+58 -20
View File
@@ -1246,7 +1246,7 @@ function getPosition(){
}
localStorage.setItem("init_city", city);
addLocation(lat,lng);
$(".nowCity").text(city);
/*city="北京";
region="";
$("#input_city").text("北京");
@@ -1548,7 +1548,6 @@ function initNews(page){
}else{
$(".infinite-scroll-preloader").hide();
}*/
})
.catch(function (error) {
console.log(error);
@@ -1723,8 +1722,8 @@ function addItems(number, lastIndex) {
'<img src='+dataObj[i].coverImg+'>'+
'<div class="card-footer">'+
'<span>'+
'<i class="icon icon-eye-orange"></i><label id="visitCount_'+dataObj[i].id+'">'+dataObj[i].visitCount+'人</label>'+
'<i class="icon icon-comments-orange"></i><label id="visitComment_'+dataObj[i].id+'">'+dataObj[i].recommendCommentCount+'条</label>'+
'<i class="icon icon-eye-orange"></i><label id="visitCount_'+dataObj[i].id+'">'+numberConver(dataObj[i].visitCount)+'人</label>'+
'<i class="icon icon-comments-orange"></i><label id="visitComment_'+dataObj[i].id+'">'+numberConver(dataObj[i].recommendCommentCount)+'条</label>'+
'</span>'+
'</div>'+
'</div>';
@@ -1753,10 +1752,14 @@ function addItems(number, lastIndex) {
html += '</div></li></ul></div></div></div>';
}
if(dataObj[i].type=="活动"){
html += '<div class="card cardInfo cardInfo01 cardInfo01b" onclick="openNewsView(\''+dataObj[i].id+'\')">'+
'<div class="card-header">'+dataObj[i].title+'</div>'+
'<img src='+dataObj[i].coverImg+'>'+
'<div class="card-footer"><span>'+dataObj[i].introduction+'</span></div></div>';
if(dataObj[i].adUrl!=null && dataObj[i].adUrl!=""){
html += '<div class="card cardInfo cardInfo01 cardInfo01b" onclick="openUrl(\''+dataObj[i].adUrl+'\')">';
}else{
html += '<div class="card cardInfo cardInfo01 cardInfo01b">';
}
html += '<div class="card-header">'+dataObj[i].title+'</div>'+
'<img src='+dataObj[i].coverImg+'>'+
'<div class="card-footer"><span>'+dataObj[i].introduction+'</span></div></div>';
}
if(dataObj[i].type=="推荐城市"){
html += '<div class="card cardInfo cardInfo01 cardInfo01a" onclick="openUrl(\''+BASE_PATH+'/quotations/building?cityName='+dataObj[i].recommendCity+'\')">'+
@@ -1823,8 +1826,8 @@ function addItems(number, lastIndex) {
'<div class="item-inner"><div class="item-title-row"><div class="item-title">'+
dataObj[i].title+'</div></div>'+
'<div class="item-subtitle"><font>'+dataObj[i].introduction+'</font></div>'+
'<div class="item-subtitle"><span><i class="icon icon-eye-orange"></i><label id="visitCount_'+dataObj[i].id+'">'+dataObj[i].visitCount+'人</label>'+
'<i class="icon icon-comments-orange"></i><label id="visitComment_'+dataObj[i].id+'">'+dataObj[i].recommendCommentCount+'条</label></span></div></div>'+
'<div class="item-subtitle"><span><i class="icon icon-eye-orange"></i><label id="visitCount_'+dataObj[i].id+'">'+numberConver(dataObj[i].visitCount)+'人</label>'+
'<i class="icon icon-comments-orange"></i><label id="visitComment_'+dataObj[i].id+'">'+numberConver(dataObj[i].recommendCommentCount)+'条</label></span></div></div>'+
'<div class="item-media"><img src='+dataObj[i].coverImg+'></div>'+
'</li></ul></div></div></div>';
}
@@ -1874,9 +1877,9 @@ function addItems(number, lastIndex) {
if(i>=lastIndex2){
if((dataObj2.length<lastIndex2 + number) || (i < lastIndex2 + number)){
var tags = dataObj2[i].poiTags;
var tagStr = '';
if(tags){
var tagStr = '<div class="item-subtitle"><span class="tag">';
tagStr = '<div class="item-subtitle"><span class="tag">';
for(var j=0;j<tags.length;j++){
if(j<3){
var tag = tags[j];
@@ -1895,11 +1898,34 @@ function addItems(number, lastIndex) {
html += '<div class="item-after"><span>距您'+dataObj2[i].distance+'m</span></div>';
}
html += '</div><div class="item-subtitle">';
if(dataObj2[i].index == 0){
html += '<div>潜力指数: <em class="em01">暂无</em></div>';
}else{
html += '<div>潜力指数: <em class="em01">'+dataObj2[i].index+'</em></div>';
}
html += '<div>潜力指数: <span class="star">';
if(dataObj2[i].index<4){
html += '<i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=5 && dataObj2[i].index<15){
html += '<i class="icon icon-star02"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=15 && dataObj2[i].index<25){
html += '<i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=25 && dataObj2[i].index<35){
html += '<i class="icon icon-star01"></i><i class="icon icon-star02"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=35 && dataObj2[i].index<45){
html += '<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=45 && dataObj2[i].index<55){
html += '<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star02"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=55 && dataObj2[i].index<65){
html += '<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=65 && dataObj2[i].index<75){
html += '<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star02"></i><i class="icon icon-star"></i>';
}else if(dataObj2[i].index>=75 && dataObj2[i].index<85){
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-star"></i>';
}else if(dataObj2[i].index>=85 && dataObj2[i].index<95){
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-star02"></i>';
}else{
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>";
if(dataObj2[i].weekendMarkup){
if(dataObj2[i].weekendMarkup>=0){
html += '<div>近30天涨跌幅: <em class="up">'+(dataObj2[i].weekendMarkup/100).toFixed(2)+'%<i class="icon icon-arrow-red"></i></em></div>';
@@ -1928,6 +1954,17 @@ function addItems(number, lastIndex) {
}
//数量进行转换
function numberConver(thumbsUpCount){
var thumbsUpCountStr = ""
if(thumbsUpCount>=10000){
thumbsUpCountStr = (thumbsUpCount/10000).toFixed(1)+"万"
}else{
thumbsUpCountStr = thumbsUpCount
}
return thumbsUpCountStr;
}
// 上次加载的序号
var lastIndex = 5;
var lastIndex2 = 5;
@@ -2541,7 +2578,6 @@ function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice,
console.log(error);
});
}
mui.init();
function openNewsView(newId) {
//mui.openWindow({
@@ -2562,8 +2598,10 @@ function openNewsView(newId) {
console.log(error);
});
},newId);
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
$("#visitCount_"+newId).text(count+'人');
if($("#visitCount_"+newId).text().indexOf("万")<0){
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
$("#visitCount_"+newId).text(count+'人');
}
}
</script>