diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index f5765d0..2abd5c9 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -2,9 +2,9 @@ //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://192.168.10.161:8084"; -var BASE_PATH = "http://192.168.10.47:8086"; +//var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://192.168.10.161:8084"; -//var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index d482b12..e2fb4e3 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -2,6 +2,7 @@ /* CSS Document */ /* 公用 */ +[v-cloak]{display:none;} *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} img{display:block;} diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index fc5cb03..d625c0a 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -524,16 +524,17 @@ var option01 = { }; -$("#trendDiv2 a").click(function(){ +/*$("#trendDiv2 a").click(function(){ $("#trendDiv2 a").removeClass("active") $(this).addClass("active") //var v = $(this).attr("t-v"); loadRentTrends(city, region, name); -}); +});*/ /* 小区租金走势 */ function loadRentTrends(city, region, name, type){ + if(type == undefined) type= 2; axios.get("/rest/trend/distRentTrends", { params: { @@ -549,6 +550,7 @@ function loadRentTrends(city, region, name, type){ var m = re.times; var pm = re.distMap var rooms = re.rooms; + if(m && rooms.length>0){ for(var i=0;i{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}'+ ''+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ ''+ ''+ @@ -47,12 +47,12 @@ Vue.component('city_increase_ranking',{ console.log(error) }) }, - follow:function(city,event){ + follow:function(city,event, type){ 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") == ""){ }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -73,7 +73,7 @@ Vue.component('city_increase_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -91,7 +91,7 @@ Vue.component('city_increase_ranking',{ } }, - abolish:function(city,event){ + abolish:function(city,event, type){ 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") == ""){ @@ -101,7 +101,7 @@ Vue.component('city_increase_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus(); diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 36f2729..ac5339b 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{ ''+ ''+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ ''+ ''+ @@ -65,13 +65,13 @@ Vue.component('city_potential_ranking',{ console.log(error) }) }, - follow:function(city,event){ + follow:function(city,event,type){ 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){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ @@ -92,7 +92,7 @@ Vue.component('city_potential_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -110,8 +110,8 @@ Vue.component('city_potential_ranking',{ } }, - abolish:function(city,event){ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + abolish:function(city,event,type){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index a52a058..2bdc26a 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -75,6 +75,7 @@ function reloadMyFocus(){ $("#myFocusFirstPage").hide(); $("#myFocus").hide(); }else{ + myFocusDatas.myFocusList = response.data.data; } }).catch(function(error){ diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index deb2de7..8008351 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -43,7 +43,7 @@
-
+
@@ -128,35 +128,6 @@
- - -