From 7d7498deaa6702fee38b04f511b8848764793c7d Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 19:53:00 +0800 Subject: [PATCH 1/4] YOUFANG1.0.3 --- fangija-zsyf/views/user/bindingMobile.html | 2 +- fangija-zsyf/views/user/codeSms.html | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/user/bindingMobile.html b/fangija-zsyf/views/user/bindingMobile.html index 764286a..937d2bd 100644 --- a/fangija-zsyf/views/user/bindingMobile.html +++ b/fangija-zsyf/views/user/bindingMobile.html @@ -89,7 +89,7 @@ $.config = {router: false} From cff317aaf2b21bac22ebbe4c9dd5f44f6de10247 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 20:19:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/city-app.js | 2 +- fangija-zsyf/yfindex.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/js/city-app.js b/fangija-zsyf/js/city-app.js index b0ff6e9..1061e47 100644 --- a/fangija-zsyf/js/city-app.js +++ b/fangija-zsyf/js/city-app.js @@ -21,7 +21,7 @@ $(document).on("click",".open-about01", function () { if(collects){ if(collects.indexOf(text)>-1){ $(this).addClass("collectionCity"); - $(this).find("i").addClass("icon-collection03"); + //$(this).find("i").addClass("icon-collection03"); } } diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index b5103c9..37ae806 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -713,8 +713,8 @@
一线城市
-

北京

-

上海

+

北京

+

上海

广州

深圳

From 826a4b0ab680e3f0333e9678e6a0a747e2705026 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 20:23:00 +0800 Subject: [PATCH 3/4] update --- fangija-zsyf/js/quotations/cityDetail.js | 3 ++- fangija-zsyf/manifest.json | 3 ++- .../component/cityIncreaseRankingComponent.js | 9 ++++++++- .../cityPotentialRankingComponent.js | 11 +++++++++-- fangija-zsyf/views/house/houseDetail.html | 19 +++++++++++++++++-- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 8b85f5f..33f09e9 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -496,6 +496,7 @@ function docollectCity(city, type){ }).then(function (response) { var msg = response.data.message; if(msg){ + if(msg == "取消关注成功"){ try{ cityInfoVue.$data.collecd = false; @@ -503,7 +504,7 @@ function docollectCity(city, type){ var da = cityDetaiVue.$data.citys if(da && da.length>0){ var index = da.indexOf(city) - if(index>0){ + if(index>=0){ da.splice(index, 1) cityDetaiVue.$data.citys = da; if(da.length>0){ diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index f5d7e32..afe5ce7 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1545,7 +1545,8 @@ "error.html", "views/rent/rent.html", "views/district/detail.html", - "views/house/houseList.html" + "views/house/houseList.html", + "views/house/cityDetail.html" ], "priority": 0 }, diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index c8a251a..6998105 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -82,7 +82,14 @@ Vue.component('city_increase_ranking',{ $(event.target).addClass("dn"); reloadMyFocus() reloadCityPotentialRanking() - cityDetaiVue.$data.citys.push(city); + if(type == 0){ + var curDatas = cityDetaiVue.$data.citys + if(curDatas && curDatas.length>0){ + if(!IsInArray(curDatas, city)){ + cityDetaiVue.$data.citys.push(city); + } + } + } } }).catch(function(error){ diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index ac5339b..7591787 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -69,7 +69,7 @@ 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, type:type}}).then(function(response){ @@ -101,7 +101,14 @@ Vue.component('city_potential_ranking',{ $(event.target).addClass("dn"); reloadMyFocus() reloadCityIncreaseRanking() - cityDetaiVue.$data.citys.push(city); + if(type == 0){ + var curDatas = cityDetaiVue.$data.citys + if(curDatas && curDatas.length>0){ + if(!IsInArray(curDatas, city)){ + cityDetaiVue.$data.citys.push(city); + } + } + } //plus.webview.getWebviewById('views/user/userInfo.html').reload(); } }).catch(function(error){ diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index d692f08..d6cf98c 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1565,7 +1565,14 @@ function addFocus(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(); - createData(city, myDatasVue.$data.cityDatas.length); + + var curDatas = response.data.data + if(curDatas && curDatas.length>0){ + if(!IsInArray(curDatas, city)){ + cityDetaiVue.$data.citys.push(city); + } + } + }).catch(function(error){ console.log(error) }) @@ -1577,7 +1584,15 @@ function addFocus(city){ reloadMyFocus() reloadCityIncreaseRanking() reloadCityPotentialRanking() - cityDetaiVue.$data.citys.push(city); + + var curDatas = cityDetaiVue.$data.citys + if(curDatas && curDatas.length>0){ + + if(!IsInArray(curDatas, city)){ + cityDetaiVue.$data.citys.push(city); + } + } + } else { $.toast(response.data.message); } From 464dc4213eea599961f00f2662493d498a2d635b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 20:33:54 +0800 Subject: [PATCH 4/4] up --- fangija-zsyf/views/house/cityDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index cbd552b..f116ae3 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -34,7 +34,7 @@ -
+