diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 8326f0f..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.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 9c81677..d11b482 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -867,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;} 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/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 9c73d1d..352406d 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -117,7 +117,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, html += "
下跌概率: 暂无
"; } - html += "
抵押可贷额度: "+tempTotalPricePercent+"
"; + html += ""; //调整最新的等级显示(其它等级不显示start) if(result.level!=null && result.level == 1){ diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 918a349..280f934 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,8 +7,8 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1.10",/*应用版本名称*/ - "code": "20110" + "name": "1.1.12",/*应用版本名称*/ + "code": "20111" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ "icons": { diff --git a/fangija-zsyf/views/city/regionRanking.html b/fangija-zsyf/views/city/regionRanking.html index 99ee596..0e44e81 100644 --- a/fangija-zsyf/views/city/regionRanking.html +++ b/fangija-zsyf/views/city/regionRanking.html @@ -69,8 +69,15 @@
{{info.region}}
{{info.avgPrice}}元/㎡
-
{{info.oneMonthUpDownRange}}%
-
{{info.oneMonthUpDownRange}}%
+
+ {{info.oneMonthUpDownRange}}% +
+
+ {{info.oneMonthUpDownRange}}% +
+
+ 暂无 +
diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 1fd5244..8e42757 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -124,8 +124,8 @@
均价  
- - + +
@@ -285,7 +285,7 @@ $.config = {router: false} var address; var tags; var baseInfo; - + var rid; var shareUrl = BASE_PATH+"/district/districtDetail?"; var sharehrefTitle = "小区名"; var sharehrefDes = "小区详情介绍!"; diff --git a/fangija-zsyf/views/house/cityDownRanking.html b/fangija-zsyf/views/house/cityDownRanking.html index ec1cce6..2cb0fd4 100644 --- a/fangija-zsyf/views/house/cityDownRanking.html +++ b/fangija-zsyf/views/house/cityDownRanking.html @@ -26,7 +26,7 @@
-