diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 2abd5c9..4e04bd9 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -3,8 +3,8 @@ //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.161:8084"; -var BASE_PATH = "http://192.168.10.53:8084"; +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.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 8bfca8b..3d46b8e 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -4,7 +4,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json'; // 添加请求拦截器 axios.interceptors.request.use(function (config) { var token = localStorage.getItem("user_token"); - config.headers.Authorization = token + config.headers.Authorization = token; return config; }, function (error) { return Promise.reject(error); diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index 00be6e0..06cb7f4 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -215,6 +215,38 @@ function loadNearDistrict(){ $(".button").click(function(){ console.log("type:"+$(this).text()) + var type = (this).attr("v") + var city = (this).attr("city") + axios.get("/rest/quotations/loadCityPriceTrends", { + params: { + city: city, + type:type + } + }).then(function (response) { + + var datas = trends.data.data + var prices = [] + var counts = [] + var times = datas.times + for(var i in times){ + var time = times[i] + time = parseInt(time.replace("-","")) + var pm = datas.cityPriceMap; + var cm = datas.countMap; + if(pm){ + prices.push(pm[time]) + } + if(cm){ + counts.push(cm[time]); + } + } + + showChart(num+"_price_chart", obj.times, prices, counts) + + }).catch(function (error) { + alert(error) + console.log(error); + }); }) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 101a051..f06e113 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1492,7 +1492,8 @@ "start.html", "views/user/userInfo.html", "views/evaluate/evaluateList.html", - "views/house/houseManageList.html" + "views/house/houseManageList.html", + "views/house/houseDetail.html" ], "priority": 0 }, diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index 551a754..5edb81d 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -63,5 +63,4 @@ Vue.component('my_focus',{ },mounted:function(){ this.loadMyFocus(); } - }) \ No newline at end of file diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 5a266c9..44abd11 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -289,7 +289,7 @@ $.config = {router: false} - @@ -485,19 +489,6 @@ $.config = {router: false}