diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 41a854b..e675534 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -927,7 +927,7 @@ input::-webkit-input-placeholder{ .cardCity .card-content-inner.row > span label{display:block;text-align:center;font-size:0.7rem;color:#666;margin-bottom:0.5rem;} .cardCity .card-content-inner.row > span.col-60{margin:0 auto;float:none;display:block;margin-top:1rem;padding:1.3rem 0;} .cardCity .card-content-inner.row > span.col-60 .icon-add{display:block;width:1rem;height:1rem;margin:0 auto;margin-bottom:0.5rem;} -.cardCity .card-footer{bottom:1.5rem;} +.cardCity .card-footer{bottom:1rem;} .cardCity .card-footer span label{display:inline-block;} .cardCity .card-footer span em{display:inline-block;} @@ -996,10 +996,12 @@ input::-webkit-input-placeholder{ .cardRankingBox01 .cardRanking .card-footer{padding:0;border-right:solid 1px #e7e7e7;} .cardRankingBox01 .cardRanking .card-footer em{color:#EB5F34;} +/* .swiper-container{height:auto;padding-bottom:0;} .swiper-pagination-bullet{background:none;border:solid 1px #d7d7d7;opacity:1;} .swiper-pagination-bullet-active{background:#F18D00;border:solid 1px #F18D00;} .swiper-container-horizontal > .swiper-pagination{top:11.2rem;bottom:inherit;} +*/ /* 贷款 */ .banner{width:100%;height:80px;background:url(../images/banner.png);background-size:100%;margin-bottom:0.5rem;} diff --git a/fangija-zsyf/css/sm.css b/fangija-zsyf/css/sm.css index 6adb9f4..6eb59a3 100644 --- a/fangija-zsyf/css/sm.css +++ b/fangija-zsyf/css/sm.css @@ -4149,7 +4149,7 @@ body.panel-closing .page { } @font-face { font-family: "iconfont-sm"; - src: url('//at.alicdn.com/t/font_1433401008_2229297.woff') format('woff'), /* chrome銆乫irefox */ url('//at.alicdn.com/t/font_1433401008_2229297.ttf') format('truetype'), /* chrome銆乫irefox銆乷pera銆丼afari, Android, iOS 4.2+*/ url('//at.alicdn.com/t/font_1433401008_2229297.svg#iconfont') format('svg'); + src: url('../fonts/font_1433401008_2229297.woff') format('woff'), /* chrome銆乫irefox */ url('../fonts/font_1433401008_2229297.ttf') format('truetype'), /* chrome銆乫irefox銆乷pera銆丼afari, Android, iOS 4.2+*/ url('../fonts/font_1433401008_2229297.svg#iconfont') format('svg'); /* iOS 4.1- */ } .icon { diff --git a/fangija-zsyf/css/theme-orange.css b/fangija-zsyf/css/theme-orange.css index 1de21f6..d6bf3cd 100644 --- a/fangija-zsyf/css/theme-orange.css +++ b/fangija-zsyf/css/theme-orange.css @@ -16,12 +16,12 @@ color: #fff; } .theme .bar-nav, -.bar-nav.theme{ +.bar-nav.theme { background-color: #F18D00; color: #fff; } .theme .bar-nav:before, -.bar-nav.theme:before, +.bar-nav.theme:before { background-color: #333; } .theme .tab-item { @@ -234,7 +234,8 @@ html:not(.watch-active-state) .theme label.label-radio:active, .bar-nav.theme .icon.icon-left{color:#fff;} .bar .button-link.theme{background:none;color:#F18D00;} -.bar-tab.theme{background:#f7f7f8;} + +.bar-tab.theme{background:#fff;} .bar-tab.theme .tab-item{color:#999;} .bar-tab.theme .tab-item.active{color:#F18D00;} .bar-tab.theme .tab-item:active{color:#F18D00;} 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/main.html b/fangija-zsyf/main.html index 1dc0688..2f5f160 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -10,6 +10,12 @@ +
diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index fc2f4c5..0bfe66d 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/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} - @@ -632,10 +636,7 @@ $.config = {router: false} + - - - -<#include "/monitor/monitor.html"> + + +