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/loan/loanInfo.js b/fangija-zsyf/js/loan/loanInfo.js index 8e502e3..6977a27 100644 --- a/fangija-zsyf/js/loan/loanInfo.js +++ b/fangija-zsyf/js/loan/loanInfo.js @@ -112,8 +112,8 @@ $("#next_btn").on("click", function () { axios.post(BASE_PATH + "/rest/loan/apply", _params).then(function (response) { var status = response.data.status; if(status){ - alert(response.data.data+ '==='); - $.toast(response.data.data); + //页面跳转 + //$.toast(response.data.data); //直接定位到贷款success页面, 调用back()就只用返回一次 window.location.href = "../../views/loan/loanSuccess.html"; }else{ diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js new file mode 100644 index 0000000..06cb7f4 --- /dev/null +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -0,0 +1,423 @@ +var city = "" +var myCollectCitys = []; +var lat; +var lng; +var allCity = [] +var myDatasVue = new Vue({ + el: '#contentTabDiv', + data: { + title:"", + cityDatas : [] + } +}) + +var date = new Date(); +var year = date.getFullYear()+'年'; +var month = date.getMonth()+1+'月'; +//document.addEventListener('plusready', onPlusReady, false); +////扩展API加载完毕,现在可以正常调用扩展API +//function onPlusReady(){ +// getPosition(); +// loadMyCollectCity(); +// +//} + +loadMyCollectCity(); + +// 获取当前用户位置 +function getPosition(){ + plus.geolocation.getCurrentPosition(function(p){ + city = p.address.city; + myCollectCitys.push(city); + lng = p.coords.longitude;//获取到当前位置的经度 + lat = p.coords.latitude;//获取到当前位置的纬度; + }, function(e){ + + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); +} + + + +function addUpChart(dataUp, num){ + /* 小区上涨 */ +//var dataUp = []; + optionUp = { + title: { + text: dataUp[0].value + '%', + subtext: '小区上涨', + x: 'center', + y: 'center', + itemGap: -8, + textStyle: { + fontFamily: 'Arial, Verdana, sans-serif', + fontSize: 30, + color: '#333', + fontWeight: 'normal' + }, + subtextStyle: { + fontFamily: '华文细黑', + fontSize: 12, + color: '#666' + } + }, + color: ['#EB5F34', '#e7e7e7'], + series: [ + { + name: '小区上涨', + type: 'pie', + radius: ['90%', '100%'], + itemStyle: { + normal: { + label: { + show: true + }, + labelLine: { + show: false + } + } + }, + data: dataUp + } + ] + }; + var myChartUp = echarts.init(document.getElementById(num+'_up_chart')); + myChartUp.setOption(optionUp,true); +} + +function addDownChart(dataDown, num){ + /* 小区下跌 */ + //var dataDown = [{value: 31, name: ''}]; + optionDown = { + title: { + text: dataDown[0].value + '%', + subtext: '小区下跌', + x: 'center', + y: 'center', + itemGap: -8, + textStyle: { + fontFamily: 'Arial, Verdana, sans-serif', + fontSize: 30, + color: '#333', + fontWeight: 'normal' + }, + subtextStyle: { + fontFamily: '华文细黑', + fontSize: 12, + color: '#666' + } + }, + color: ['#88D053', '#e7e7e7'], + series: [ + { + name: '小区下跌', + type: 'pie', + radius: ['90%', '100%'], + itemStyle: { + normal: { + label: { + show: true + }, + labelLine: { + show: false + } + } + }, + data: dataDown + } + ] + }; + + var myChartUp = echarts.init(document.getElementById(num+'_down_chart')); + myChartUp.setOption(optionDown,true); +} + +//加载我关注的城市 +function loadMyCollectCity(){ + axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) { + var curDatas = response.data.data + + if(curDatas){ + var ret = [] + for(var i in curDatas){ + var curCity = curDatas[i] + if(!IsInArray(myCollectCitys, curCity)){ + + allCity.push(curCity) + var j = 1; + axios.all([loadCityPriceInfo(curCity), detail(curCity), loadCityPricesAndCounts(curCity)]) + .then(axios.spread(function (acct, perms, trends) { + var cityObj = new Object(); + var data1 = acct.data.data + cityObj.numId_up_chart = j+"_up_chart"; + cityObj.numId_down_chart = j+"_down_chart"; + cityObj.numId_price_chart = j+"_price_chart"; + j = j+1; + if(data1){ + cityObj.city = data1.city + cityObj.cityTopMonthAvgPrice = data1.cityTopMonthAvgPrice + cityObj.downChance = data1.downChance + cityObj.follow = data1.follow + cityObj.index = data1.index + cityObj.oneMonthUpDownRange = (data1.oneMonthUpDownRange*100).toFixed(2) + cityObj.oneYearUpDownRange = data1.oneYearUpDownRange + cityObj.rangeLevel = data1.rangeLevel + cityObj.time = year + month + } + var data2 = perms.data.data + if(data2){ + cityObj.downRate = data2.downRate + cityObj.upRate = data2.upRate + } + var data3 = trends.data.data + if(data3){ + cityObj.times = data3.times + cityObj.cityPriceMap = data3.cityPriceMap + cityObj.countMap = data3.countMap + } + ret.push(cityObj); + myDatasVue.$data.cityDatas = ret; + //console.log(myDatasVue.$data.cityDatas.length); + })); + } + } + //myDatasVue.$data.cityDatas = ret; + } + + + }).catch(function (error) { + alert(error) + console.log(error); + }); +} + + +function loadCityPriceInfo(city){ + return axios.get("/rest/quotations/cityPriceInfo?city="+city); +} + +function detail(city){ + return axios.get("/rest/quotations/hosueQuatations?city="+city); +} + +function loadCityPricesAndCounts(city){ + return axios.get("/rest/quotations/loadCityPriceTrends?city="+city+"&type=2") +} + +function loadNearDistrict(){ + return axios.get("/rest/districts/nearDistrict?lat="+lat+"&lng="+lng) +} + +$(".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); + }); +}) + + +function IsInArray(arr, val){ + var testStr=','+arr.join(",")+","; + return testStr.indexOf(","+val+",")!=-1; +} + +var t1 = window.setInterval(loadChart,1000); +function loadChart(){ + var d1 = myDatasVue.$data.cityDatas.length + var d2 = allCity.length; + if(d2>0 && d2==d1){ + + loadUpOrDownChart(); + + loadTrends(); + + window.clearInterval(t1); + } +} + +function loadUpOrDownChart(){ + var datas = myDatasVue.$data.cityDatas + for(var i in datas){ + var obj = datas[i] + var num = parseInt(i)+1; + + var cityObj1 = new Object(); + cityObj1.name= "" + cityObj1.value = obj.upRate + + var cityObj2 = new Object(); + cityObj2.name= "" + cityObj2.value = 100 - obj.upRate + + dataUp = [cityObj1, cityObj2] + addUpChart(dataUp, num) + + + var cityObj3 = new Object(); + cityObj3.name= "" + cityObj3.value = obj.downRate + + var cityObj4 = new Object(); + cityObj4.name= "" + cityObj4.value = 100 - obj.downRate + + dataDown = [cityObj3, cityObj4] + addDownChart(dataDown, num) + } +} + +function loadTrends(){ + var datas = myDatasVue.$data.cityDatas + for(var i in datas){ + var obj = datas[i] + var num = parseInt(i)+1; + + var prices = [] + var counts = [] + var times = obj.times + for(var i in times){ + var time = times[i] + time = parseInt(time.replace("-","")) + var pm = obj.cityPriceMap; + var cm = obj.countMap; + if(pm){ + prices.push(pm[time]) + } + if(cm){ + counts.push(cm[time]); + } + + } + + showChart(num+"_price_chart", obj.times, prices, counts) + } +} + + +function showChart(idDom, categories, prices, counts){ + if(!prices){ + prices = [] + } + if(!counts){ + counts = [] + } + /* 城市均价及挂牌走势 */ + var chart = Highcharts.chart(idDom, { + title: { + text: '城市均价及挂牌走势', + y: -30 + }, + colors: ['#F88C9F', '#78CDE6'], + xAxis: { + type: 'datetime', + categories: categories, + boundaryGap: false, + tickInterval: 2, + tickLength: 6, + crosshair: true + }, + yAxis: [{ // 第一个Y轴,放置在左边 + title: { + text: '元/㎡', + align: 'high', + offset: 4, + rotation: 0, + y: -20 + }, + plotLines: [{ + value: 0, + width: 1, + color: '#808080' + }], + allowDecimals: false + }, { // 第二个Y轴,放置在右边 + linkedTo: 0, + opposite: true, // 通过此参数设置坐标轴显示在对立面 + title: { + text: '套', + align: 'high', + offset: 25, + rotation: 0, + y: -20 + }, + plotLines: [{ + value: 0, + width: 1, + color: '#808080' + }], + allowDecimals: false + }], + credits: { + enabled: false + }, + plotOptions: { + line: { + connectNulls: true //该设置会连接空值点 + }, + series: { + events: { + legendItemClick: function(e) { + return false; + } + }, + marker: { + radius: 3, //曲线点半径,默认是4 + symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle" + } + } + }, + tooltip: { + shared: true + }, + series: [{ + name: '均价', + zIndex: 1, + data: prices, + tooltip: { + valueSuffix: '元/㎡' + } + }, { + name: '挂牌量', + type: 'column', + borderColor: null, + data: counts, + tooltip: { + valueSuffix: '套' + } + }] +}); +} 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 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/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} - @@ -498,7 +502,6 @@ $.config = {router: false} coordsType:'bd09ll' } ); - alert(city) var myFocus = new Vue({ el:"#myFocus" }) @@ -630,10 +633,7 @@ $.config = {router: false} + + + + + + + + + + + + + + + + + + + + + + + + +