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/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/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 @@ -
+
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); } 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} diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 2365274..e1d94b6 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -713,8 +713,8 @@
一线城市
-

北京

-

上海

+

北京

+

上海

广州

深圳