From 3f613284643b17fd1d8747732ae3401778218c3b Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 14:34:31 +0800 Subject: [PATCH 1/7] YOUFANG 1.0.3 --- .../component/cityIncreaseRankingComponent.js | 11 ++++ .../cityPotentialRankingComponent.js | 28 +++++++-- fangija-zsyf/views/house/houseDetail.html | 59 +++++++++++++++++-- 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index de7e321..411193a 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -56,6 +56,7 @@ Vue.component('city_increase_ranking',{ $(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(); @@ -70,6 +71,7 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() + reloadCityPotentialRanking() cityDetaiVue.$data.citys.push(city); }).catch(function(error){ console.log(error) @@ -91,6 +93,7 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus(); + reloadCityPotentialRanking() //plus.webview.getWebviewById('views/user/userInfo.html').reload() var da = cityDetaiVue.$data.citys if(da && da.length>0){ @@ -111,3 +114,11 @@ Vue.component('city_increase_ranking',{ this.loadCityIncreaseRanking(); } }) + +function reloadCityIncreaseRanking(){ + axios.get("/rest/quotations/markUpTopInfos").then(function(response){ + cityIncreaseRankingData.cityIncreaseRankingList = response.data.data; + }).catch(function(error){ + console.log(error) + }) +} diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 8875151..73c205a 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -69,16 +69,15 @@ 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"); - 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() + reloadCityIncreaseRanking() //cityDetaiVue.$data.citys.push(city); }).catch(function(error){ console.log(error) @@ -90,6 +89,7 @@ Vue.component('city_potential_ranking',{ $(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){ @@ -103,7 +103,7 @@ Vue.component('city_potential_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() - + reloadCityIncreaseRanking() var da = cityDetaiVue.$data.citys if(da && da.length>0){ var index = da.indexOf(city) @@ -121,4 +121,24 @@ Vue.component('city_potential_ranking',{ mounted:function(){ this.loadCityPotentialRanking(); } -}) \ No newline at end of file +}) + +function reloadCityPotentialRanking(){ + axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ + list = response.data.data; + $(list).each(function(i){ + var index = this.index; + var totalHalfStar = Math.round(Math.round(index/5)/2) //总半星 + var starNum = Math.floor(totalHalfStar/2) //全星 + var halfStarNum = totalHalfStar%2 //半星 + var noneStarNum = 5-starNum-halfStarNum //空星 + this.starNum = starNum; + this.halfStarNum = halfStarNum; + this.noneStarNum = noneStarNum; + }) + cityPotentialRankingData.cityPotentialRankingList = response.data.data; + + }).catch(function(error){ + console.log(error) + }) +} diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index f04faaa..c17332e 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -327,6 +327,13 @@ 按城市等级 +
+
+
+
+
+
+
@@ -1321,13 +1328,13 @@ $.config = {router: false} /* 获取城市 */ $(".popup-about01 .cityGPS").on("click", function () { - $("#input_city").val($(this).find("p").text()); + //$("#input_city").val($(this).find("p").text()); $(".cityChoice a").text($(this).find("p").text()); $(".popup-about01 p").removeClass("active"); addFocus($(this).find("p").text()) }); $(".popup-about01 p").on("click", function () { - $("#input_city").val($(this).text()); + //$("#input_city").val($(this).text()); $(".cityChoice a").text($(this).text()); $(".popup-about01 p").removeClass("active"); $(this).addClass("active"); @@ -1340,6 +1347,42 @@ $.config = {router: false} }); loadMyCollectCity(); + + //城市选择 + //$("#cityCopy").html($('.tabs').html()) + var getAllCitys = function() { + var list = new Array(); + $("#tabCity1 #cityContainer .city p").each(function(i, o) { + list.push($(o).text()); + }); + return list; + } + + var search = function(){ + var city = $("#citySearchInp").val(); + $("#selectContainer .city-list").empty(); + $("#selectContainer").show(); + + var cityList = getAllCitys(); + for(var i=0;i'+cityList[i]+'

'); + } + } + + if(city == ""){ + $("#selectContainer").hide(); + } + } + + $("#citySearchInp").bind('input propertychange keyup', function() { + search(); + }); + + $("#citySearchInp").bind('keyup', function() { + search(); + }); + } @@ -1393,10 +1436,14 @@ $.config = {router: false} }); + function addCityFocus(city){ + //city=city.replace("","") + //$("#input_city").text(city); + addFocus(city); + } - - - + + From 2e41d41deddb43219c13795833fffbc731f98f05 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 14:39:45 +0800 Subject: [PATCH 3/7] YOUFANG 1.0.3 --- fangija-zsyf/views/house/houseDetail.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index e3814fd..18f9e52 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1572,12 +1572,10 @@ function addFocus(city){ }) }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - reloadMyFocus() - reloadCityIncreaseRanking() - reloadCityPotentialRanking() - cityDetaiVue.$data.citys.push(city); if(response.data.status){ reloadMyFocus() + reloadCityIncreaseRanking() + reloadCityPotentialRanking() cityDetaiVue.$data.citys.push(city); } else { $.toast(response.data.message); From b6bd05c53c49f85de236c9449e8347338fc1bf29 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 14:39:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20mui.js=20=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=BF=94=E5=9B=9E=E7=9B=B4=E6=8E=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E5=86=8D=E7=82=B9=E5=87=BB=E4=B8=80=E6=AC=A1=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C=20=20=E5=9C=A8=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=20=20=E6=AD=A3=E7=A1=AE=E5=BA=94=E8=AF=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E5=B1=82=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/add.html | 1 + fangija-zsyf/views/house/cityDetail.html | 1 + fangija-zsyf/views/house/houseDetail.html | 1 + fangija-zsyf/views/house/regions.html | 1 + 4 files changed, 4 insertions(+) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index c91d8dc..3194f18 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1235,6 +1235,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 9ad380c..d6adbf8 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -137,6 +137,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 7bdf490..8322ef7 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1199,6 +1199,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/house/regions.html b/fangija-zsyf/views/house/regions.html index 29712a7..aeb29e5 100644 --- a/fangija-zsyf/views/house/regions.html +++ b/fangija-zsyf/views/house/regions.html @@ -93,6 +93,7 @@ $.config = {router: false} + From 415bbb1733d66fa34f04cc84657da19f4a506654 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 14:40:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20mui.js=20=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=BF=94=E5=9B=9E=E7=9B=B4=E6=8E=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E5=86=8D=E7=82=B9=E5=87=BB=E4=B8=80=E6=AC=A1=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C=20=20=E5=9C=A8=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=20=20=E6=AD=A3=E7=A1=AE=E5=BA=94=E8=AF=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E5=B1=82=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/rent/rentManager.html | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index 8e4f89c..6b35b90 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -116,6 +116,7 @@ $.config = {router: false} + From 750e68eef74d99fcba9f28b2308dbbe2e9ebdfc0 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 14:40:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20mui.js=20=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=BF=94=E5=9B=9E=E7=9B=B4=E6=8E=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E5=86=8D=E7=82=B9=E5=87=BB=E4=B8=80=E6=AC=A1=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C=20=20=E5=9C=A8=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=20=20=E6=AD=A3=E7=A1=AE=E5=BA=94=E8=AF=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E5=B1=82=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/setting/about.html | 1 + fangija-zsyf/views/setting/agreement.html | 1 + 2 files changed, 2 insertions(+) diff --git a/fangija-zsyf/views/setting/about.html b/fangija-zsyf/views/setting/about.html index 977eedd..0b9437f 100644 --- a/fangija-zsyf/views/setting/about.html +++ b/fangija-zsyf/views/setting/about.html @@ -83,6 +83,7 @@ $.config = {router: false} + \ No newline at end of file diff --git a/fangija-zsyf/views/setting/agreement.html b/fangija-zsyf/views/setting/agreement.html index d53e0db..387660f 100644 --- a/fangija-zsyf/views/setting/agreement.html +++ b/fangija-zsyf/views/setting/agreement.html @@ -204,6 +204,7 @@ $.config = {router: false} + \ No newline at end of file From c8e2e08252cabbf20ef274c4828cc7013e3d3eae Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 14:41:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20mui.js=20=20=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E8=BF=94=E5=9B=9E=E7=9B=B4=E6=8E=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E5=86=8D=E7=82=B9=E5=87=BB=E4=B8=80=E6=AC=A1=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C=20=20=E5=9C=A8=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=20=20=E6=AD=A3=E7=A1=AE=E5=BA=94=E8=AF=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8A=E4=B8=80=E5=B1=82=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/user/bindingMobile.html | 1 + fangija-zsyf/views/user/passLogin.html | 1 + fangija-zsyf/views/user/updatePass.html | 1 + 3 files changed, 3 insertions(+) diff --git a/fangija-zsyf/views/user/bindingMobile.html b/fangija-zsyf/views/user/bindingMobile.html index 6cd3a43..764286a 100644 --- a/fangija-zsyf/views/user/bindingMobile.html +++ b/fangija-zsyf/views/user/bindingMobile.html @@ -79,6 +79,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index 93a9920..de499dd 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -87,6 +87,7 @@ $.config = {router: false} + diff --git a/fangija-zsyf/views/user/updatePass.html b/fangija-zsyf/views/user/updatePass.html index f414c21..a43a922 100644 --- a/fangija-zsyf/views/user/updatePass.html +++ b/fangija-zsyf/views/user/updatePass.html @@ -77,6 +77,7 @@ $.config = {router: false} +