From c4e62f5e5ee0839882258f25af6f99a5ad8fd776 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 14:44:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/cityIncreaseRankingComponent.js | 32 +++++++++++----- .../cityPotentialRankingComponent.js | 37 ++++++++++++------- fangija-zsyf/views/house/cityDetail.html | 2 +- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index de7e321..231c4c6 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -53,12 +53,18 @@ 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() - 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() + 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) @@ -67,10 +73,16 @@ 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() - 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() + cityDetaiVue.$data.citys.push(city); + } + }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 8875151..5965026 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -72,14 +72,20 @@ Vue.component('city_potential_ranking',{ alert("rrrr") }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - $(event.target).parent().children().removeClass("dn"); - $(event.target).addClass("dn"); - alert(city) - 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() - //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"); + alert(city) + 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() + //cityDetaiVue.$data.citys.push(city); + } }).catch(function(error){ console.log(error) }) @@ -87,11 +93,16 @@ 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() - 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() + cityDetaiVue.$data.citys.push(city); + //plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 9ad380c..dac5cf0 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -38,7 +38,7 @@
- 取消关注 + 取消关注 关注
From 2f91452fea66ee2fd17ea0ea15aebd40363fd7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 15:08:38 +0800 Subject: [PATCH 2/4] fix bug 4772 --- fangija-zsyf/yfindex.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 2525d05..68abbd7 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -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 += '
  • '+re["level"+i]+'
  • '; } - html += '
  • 自定义: - 万确定
  • '; + html += '
  • 自定义: - 万确定
  • '; $("#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){ From 0408aa84be10493d0ab620e86587fe71c24bbffa Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 16 Apr 2018 15:11:07 +0800 Subject: [PATCH 3/4] aa --- fangija-zsyf/views/house/houseManageList.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 18bce1a..4d8ffad 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -212,8 +212,17 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap //htmlContent = htmlContent +"
    "+result.roomCount+"室"+result.hallCount+"厅"; var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum; htmlContent = htmlContent +"
    "+houseRoomNum; - - htmlContent = htmlContent +"  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
    " + 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+"
    " htmlContent = htmlContent +"
    "; //对应城市地区小区30天涨跌幅 //动态构建key From 03cf44c9e2f874994e08d2dabea995bd598e2610 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 15:12:54 +0800 Subject: [PATCH 4/4] YOUFANG1.0.3 --- fangija-zsyf/css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 5f3c7a7..398ca1e 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -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;}