diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 4f9f15a..4380bdf 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,9 +1,9 @@ /**服务端地址**/ -var BASE_PATH = "http://youfang.fangjia.com"; +//var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.164:8084"; //var BASE_PATH = "http://192.168.10.53: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.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 39cb17c..d11b482 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -7,6 +7,7 @@ ul li{list-style:none;} img{display:block;} a{color:#F18D00;} a:active{color:#F18D00;} +input{line-height:inherit;} em{font-style:normal;color:#333;} /* em.up{color:#EB5F34;} @@ -490,10 +491,11 @@ input::-webkit-input-placeholder{ .cardInfo01{color:#333;} .cardInfo01 > img{width:100%;} .cardInfo01 span{font-size:0.6rem;color:#666;} -.cardInfo01 .card-header{padding:0;font-size:0.85rem;} -.cardInfo01 .card-content-inner{padding:0;} -.cardInfo01 .card-footer{padding:0;} +.cardInfo01 .card-header{padding:0.5rem 0;font-size:0.85rem;} +.cardInfo01 .card-content-inner{padding:0.5rem 0;} +.cardInfo01 .card-footer{padding:0.5rem 0;} +.cardInfo01a .card-content-inner{padding:0;} .cardInfo01a .card-content-inner .tag{display:block;margin-bottom:0.5rem;} .cardInfo01a .card-content-inner .tag small{margin-left:0;margin-right:0.2rem;} .cardInfo01a .card-footer span{font-size:0.7rem;color:#999;text-align:left;width:50%;} @@ -501,13 +503,6 @@ input::-webkit-input-placeholder{ .cardInfo01a .card-footer span strong{font-size:0.75rem;color:#333;font-weight:normal;} .tag small{height:0.9rem;border:solid 1px #FFD038;border-radius:2px;padding:0 5px;font-size:80%;color:#F5A100;line-height:0.9rem;margin-left:0.2rem;display:inline-block;} -/* -.tag small:nth-child(1){background:#E7F2FF;color:#76A5DD;margin-left:0;} -.tag small:nth-child(2){background:#E6F9E6;color:#6FBA6F;} -.tag small:nth-child(3){background:#FDF3DD;color:#E8AF27;} -.tag small:nth-child(4){background:#FDE9E2;color:#DD7B57;} -.tag small:nth-child(5){background:#F5EFFF;color:#A585D6;} -*/ .cardInfo01b .card-footer span{font-size:0.7rem;color:#999;display:inline-block;width:100%;word-wrap:break-word;white-space:normal;} @@ -553,7 +548,7 @@ input::-webkit-input-placeholder{ /* 资讯 */ .content-padded{margin:0.75rem;} .content-padded h1{font-size:1.1rem;line-height:1.6rem;letter-spacing:0.11rem;} -.content-padded p{font-size:0.8rem;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;} +.content-padded p{font-size:0.8rem;color:#333;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;} .content-padded p span{margin-left:1rem;} .content-padded p small{font-size:0.65rem;color:#999;line-height:0.9rem;letter-spacing:0.07rem;float:left;} .content-padded img{width:100%;} @@ -620,14 +615,14 @@ input::-webkit-input-placeholder{ .top{width:100%;padding:0.75rem 0.5rem;border-bottom:solid 1px #e7e7e7;overflow:hidden;position:absolute;top:0;z-index:10;} .top.bar{height:auto;} .top.bar ~ .content{top:66px;} -.top .searchBox{background:#EFEFEF;border-radius:0.25rem;overflow:hidden;padding:0.3rem 0;} -.top .searchBox .cityChoice{float:left;margin-left:0.5rem;margin-right:0.5rem;} -.top .searchBox .cityChoice a{color:#333;display:inline-block;} -.top .searchBox .cityChoice i{width:10px;height:5px;background:url(../images/arrow_select.png) no-repeat center center;background-size:100%;display:inline-block;vertical-align:middle;margin-left:0.2rem;} -.top .searchBox span{float:left;border-left:solid 1px #e0e0e0;overflow:hidden;} -.top .searchBox span input{width:85%;background:none;padding-left:0.25rem;display:inline-block;vertical-align:text-bottom;border:none;font-size:0.7rem;} -.top .searchBox span i{width:16px;height:16px;background:url(../images/search.png) no-repeat left center;background-size:100%;display:inline-block;vertical-align:text-bottom;margin-left:0.3rem;} -.top .searchBox .cancel{float:right;color:#2db0fc;} +.top .icon{color:#b4b4b4;padding:0;} +.top .searchBox{background:#EFEFEF;border-radius:0.25rem;padding:0.3rem 0;position:relative;} +.top .searchBox .cityChoice{width:24%;margin-left:0.5rem;border-right:solid 1px #e0e0e0;position:absolute;left:0;top:0.3rem;z-index:100;} +.top .searchBox .cityChoice a{color:#333;display:inline-block;vertical-align:middle;max-width:70px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +.top .searchBox .cityChoice i{font-size:0.5rem;right:-0.3rem;} +.top .searchBox span{width:100%;display:block;position:relative;} +.top .searchBox span i{font-size:0.9rem;left:34%;padding-left:0.2rem;} +.top .searchBox span input{width:90%;background:none;border:none;padding-left:35%;display:inline-block;vertical-align:middle;} .top01{background:#fff;border-bottom:solid 1px #e7e7e7;padding:0 0.5rem;} .top01 .searchBox{background:none;} @@ -872,8 +867,11 @@ input::-webkit-input-placeholder{ #chart01{height:270px;} #chart01a{height:270px;} .topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;margin-left:-0.5rem;} -.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;} -.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;} +.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} +.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} + +.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} +.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} @@ -1022,19 +1020,12 @@ input::-webkit-input-placeholder{ .cardRankingBox01 .cardRanking{width:33.33%;border:none;border-radius:0;margin:0;} .cardRankingBox01 .cardRanking:last-child{border-right:none;} .cardRankingBox01 .cardRanking .card-header:first-child{border-right:none;padding:0;padding-top:0.5rem;padding-bottom:0.5rem;font-size:0.75rem;} -.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;} +.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;color:#333;} .cardRankingBox01 .cardRanking .card-header em{font-size:0.85rem;color:#F18D00;margin-right:0.2rem;} .cardRankingBox01 .cardRanking .card-content-inner{color:#999;border-right:solid 1px #e7e7e7;} .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;} .banner .content-block{padding:0 2rem;padding-top:1rem;} @@ -1409,6 +1400,9 @@ input[type=range]::-webkit-slider-thumb { /* 自适应 */ @media(max-width:414px){ + .top .searchBox .cityChoice{width:24%;} + .top .searchBox span i{left:28%;} + .top .searchBox span input{padding-left:29%;} .list-block .item-title span.c3a{max-width:220px;} .textAlignLeft{left:88px;} .textAlignLeft01{left:110px;} @@ -1427,6 +1421,9 @@ input[type=range]::-webkit-slider-thumb { .guideBox02 .link{margin-top:17.7rem;} } @media(max-width:375px){ + .top .searchBox .cityChoice{width:26%;} + .top .searchBox span i{left:29%;} + .top .searchBox span input{padding-left:30%;} .list-block .item-title span.c3a{max-width:180px;} label.spacing01{margin-right:11px;} label.spacing02{margin-right:12px;} @@ -1439,6 +1436,9 @@ input[type=range]::-webkit-slider-thumb { .rangeNote span.span05{margin-right:13%;} } @media(max-width:320px){ + .top .searchBox .cityChoice{width:30%;} + .top .searchBox span i{left:34%;} + .top .searchBox span input{padding-left:35%;} .topic .topicTitle{font-size:0.75rem;} .list-block .item-title span.c3a{max-width:112px;} .list-block .item-title label{max-width:100px;} diff --git a/fangija-zsyf/images/icon-chart01_common.png b/fangija-zsyf/images/icon-chart01_common.png new file mode 100644 index 0000000..0cee2f1 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01_common.png differ diff --git a/fangija-zsyf/images/icon-chart01a_common.png b/fangija-zsyf/images/icon-chart01a_common.png new file mode 100644 index 0000000..581d3a2 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01a_common.png differ diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 4306c8c..6ffdf33 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -1,5 +1,8 @@ var colorList = ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3']; var labelFont = 'bold 12px Sans-serif'; +var date = new Date(); +var year = date.getFullYear(); +var month = date.getMonth()+1; var dates; var data; @@ -114,7 +117,8 @@ function clickLineChart(type){ } /* 图表切换 */ -function lineChart() { + +/*function lineChart() { mode = "kLine" $(".icon-chart01a").hide(); $(".icon-chart01").show(); @@ -135,7 +139,33 @@ function kLineChart() { $("#chart01a").show(); $("#chart01").hide(); loadLineData(city, region, name, type); -}; +};*/ + +$("body").delegate(".icon-chart01a-no", "click", function () { + $(this).addClass("icon-chart01a"); + $(this).removeClass("icon-chart01a-no"); + $(this).parent().find(".icon-chart01").addClass("icon-chart01-no") + $(this).parent().find("i").removeClass("icon-chart01") + mode = "line" + var type = $("#trendDiv1 a.active").attr("t-v"); + $("#chart01a").show(); + $("#chart01").hide(); + loadLineData(city, region, name, type); +}) + +$("body").delegate(".icon-chart01-no", "click", function () { + + $(this).addClass("icon-chart01"); + $(this).removeClass("icon-chart01-no"); + $(this).parent().find(".icon-chart01a").addClass("icon-chart01a-no") + $(this).parent().find("i").removeClass("icon-chart01a") + mode = "kLine" + var type = $("#trendDiv1 a.active").attr("t-v"); + $("#chart01a").hide(); + $("#chart01").show(); + loadKLineData(city, region, name, type); + +}) function showLoadRentTrends(type) { @@ -199,7 +229,16 @@ function doLoadKLineData(city, region, name, type){ var counts = []; var times = [] var haveCount = false; + var curMonth; + if(month<10){ + curMonth = year+"-0"+month; + }else{ + curMonth = year+"-"+month; + } for(var d in datas){ + if(d == curMonth){ + continue; + } times.push(d); var prices = new Array(); @@ -268,7 +307,6 @@ function showTrends(v){ var option01 = { - animation: false, color: colorList, title: { text: null, @@ -280,9 +318,6 @@ var option01 = { data: ['均价'] }, tooltip: { - triggerOn: 'none', - transitionDuration: 0, - confine: true, bordeRadius: 4, borderWidth: 1, borderColor: '#333', @@ -292,19 +327,21 @@ var option01 = { color: '#333' }, formatter: function (params) { - var res = params[0].seriesName + ' ' + params[0].name; - res += '
月初 : ' + params[0].value[1]+ '元/㎡'; - res += '
月末 : ' + params[0].value[2]+ '元/㎡'; - res += '
最低 : ' + params[0].value[3]+ '元/㎡'; - res += '
最高 : ' + params[0].value[4]+ '元/㎡'; - return res; - }, - position: function (pos, params, el, elRect, size) { - var obj = { - top: 60 - }; - obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5; - return obj; + var res = params.seriesName + ' ' + params.name; + var vals = params.value; + if(vals == undefined){ + var obj = params[0]; + res = obj.seriesName + ' ' + obj.name; + vals = obj.value; + } + if(vals){ + res += '
月初 : ' + vals[1]+ '元/㎡'; + res += '
月末 : ' + vals[2]+ '元/㎡'; + res += '
最低 : ' + vals[3]+ '元/㎡'; + res += '
最高 : ' + vals[4]+ '元/㎡'; + return res; + } + } }, axisPointer: { @@ -313,20 +350,10 @@ var option01 = { }] }, dataZoom: [{ - type: 'slider', - xAxisIndex: [0, 1], - realtime: false, - start: 1, - end: 99, - top: 5, - height: 20, - handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', - handleSize: '120%' - }, { type: 'inside', xAxisIndex: [0, 1], - start: 40, - end: 70, + start: 1, + end: 99, top: 30, height: 20 }], @@ -369,7 +396,7 @@ var option01 = { triggerTooltip: true, handle: { show: true, - margin: -70, + margin: -90, color: '#F18D00' } } @@ -412,7 +439,7 @@ var option01 = { grid: [{ left: 20, right: 20, - top: 60, + top: 30, height: 120 }, { left: 20, @@ -763,7 +790,7 @@ function doLoadLineData(city, region, name, type){ function showLineChart(times, datas){ var option01b = { tooltip: { - triggerOn: 'none', + //triggerOn: 'none', transitionDuration: 0, confine: true, bordeRadius: 4, @@ -791,11 +818,11 @@ function showLineChart(times, datas){ y: 10, x2: 20, y2: 60, - top: 60, + top: 30, height: 120 }, color: ['#78CDE6'], - dataZoom: [{ + /*dataZoom: [{ realtime: false, start: 1, end: 99, @@ -803,7 +830,7 @@ function showLineChart(times, datas){ height: 20, handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', handleSize: '120%' - }], + }],*/ xAxis: { type: 'category', boundaryGap: false, diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 9435ac6..b1dca64 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -13,7 +13,7 @@