Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -1365,6 +1365,7 @@ input[type=range]::-webkit-slider-thumb {
|
||||
}
|
||||
@media(max-width:320px){
|
||||
.list-block .item-title span.c3a{max-width:112px;}
|
||||
.list-block .item-title label{max-width:100px;}
|
||||
label.spacing01{margin-right:11px;}
|
||||
label.spacing02{margin-right:12px;}
|
||||
.priceInfo div div span{width:125px;}
|
||||
|
||||
@@ -53,13 +53,19 @@ Vue.component('city_increase_ranking',{
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityPotentialRanking()
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
var msg = response.data.message;
|
||||
if(msg != "取消关注成功" && msg != "关注成功"){
|
||||
$.toast(msg);
|
||||
}else{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityPotentialRanking()
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
|
||||
//cityDetaiVue.$data.citys.push(city);
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
@@ -68,11 +74,17 @@ Vue.component('city_increase_ranking',{
|
||||
})
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityPotentialRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
var msg = response.data.message;
|
||||
if(msg != "取消关注成功" && msg != "关注成功"){
|
||||
$.toast(msg);
|
||||
}else{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityPotentialRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
}
|
||||
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
|
||||
@@ -69,16 +69,23 @@ Vue.component('city_potential_ranking',{
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
clicked('/views/user/passLogin.html',true,false,{},{},function(){
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
alert("rrrr")
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
//cityDetaiVue.$data.citys.push(city);
|
||||
|
||||
var msg = response.data.message;
|
||||
if(msg != "取消关注成功" && msg != "关注成功"){
|
||||
$.toast(msg);
|
||||
}else{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
//cityDetaiVue.$data.citys.push(city);
|
||||
}
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
@@ -86,12 +93,17 @@ Vue.component('city_potential_ranking',{
|
||||
})
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
var msg = response.data.message;
|
||||
if(msg != "取消关注成功" && msg != "关注成功"){
|
||||
$.toast(msg);
|
||||
}else{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
}
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
@@ -141,4 +153,4 @@ function reloadCityPotentialRanking(){
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -212,8 +212,17 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
|
||||
//htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅";
|
||||
var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum;
|
||||
htmlContent = htmlContent +"<div class='item-title'><small>"+houseRoomNum;
|
||||
|
||||
htmlContent = htmlContent +" "+result.area+"㎡ "+result.floor+"/"+result.height+"层</small></div>"
|
||||
var floor_height = "";
|
||||
if(result.floor!=0){
|
||||
floor_height = result.floor;
|
||||
}
|
||||
if(result.height!=0){
|
||||
floor_height += "/" + result.height;
|
||||
}
|
||||
if(floor_height!=""){
|
||||
floor_height+="层";
|
||||
}
|
||||
htmlContent = htmlContent +" "+result.area+"㎡ "+floor_height+"</small></div>"
|
||||
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
|
||||
//对应城市地区小区30天涨跌幅
|
||||
//动态构建key
|
||||
|
||||
@@ -2345,7 +2345,7 @@ $("body").delegate("#select_region .button", "click", function () {
|
||||
$(".selectContent").hide();
|
||||
});
|
||||
|
||||
$("#confirm_btn #select_price").on("click", function () {
|
||||
function customPriceQuery () {
|
||||
if($("#minPrice").val()==""){
|
||||
$.toast('请填写最小价格');
|
||||
return;
|
||||
@@ -2376,7 +2376,7 @@ $("#confirm_btn #select_price").on("click", function () {
|
||||
$(".price").removeClass("active");
|
||||
$(".price i").removeClass("icon-up");
|
||||
$(".selectContent").hide();
|
||||
});
|
||||
}
|
||||
/* 标签 */
|
||||
$(".reset_btn").on("click", function () {
|
||||
$(".button").removeClass("active");
|
||||
@@ -2491,7 +2491,7 @@ function getCityPriceLevel(cityParam){
|
||||
for(var i=1;i<9;i++){
|
||||
html += '<li class="item-content"><div class="item-inner"><div class="item-title theme" data-id="1"><i class="icon"></i>'+re["level"+i]+'</div></div></li>';
|
||||
}
|
||||
html += '<li class="item-content"><div class="item-inner"><div class="item-title theme" data-id="8"><i class="icon"></i>自定义:<input type="number" placeholder="最小" id="minPrice"> - <input type="number" placeholder="最大" id="maxPrice"> 万<a class="button button-fill theme" id="confirm_btn">确定</a></div></div></li></ul>';
|
||||
html += '<li class="item-content"><div class="item-inner"><div class="item-title theme" data-id="8"><i class="icon"></i>自定义:<input type="number" placeholder="最小" id="minPrice"> - <input type="number" placeholder="最大" id="maxPrice"> 万<a class="button button-fill theme" onclick="customPriceQuery()">确定</a></div></div></li></ul>';
|
||||
$("#select_price").html(html);
|
||||
|
||||
$("#select_price li").on("click", function () {
|
||||
@@ -2500,6 +2500,9 @@ function getCityPriceLevel(cityParam){
|
||||
$(this).find(".item-title").addClass("active");
|
||||
$(this).find(".item-title i").addClass("icon-check");
|
||||
var index = $("#select_price li").index(this);
|
||||
if(index == 9){
|
||||
return;
|
||||
}
|
||||
if(index < 8){
|
||||
var text = $("#select_price li").eq(0).find(".item-title").hasClass("active");
|
||||
if(text){
|
||||
|
||||
Reference in New Issue
Block a user