Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1

This commit is contained in:
xuhe@fangjia.com
2018-04-12 17:15:32 +08:00
8 changed files with 361 additions and 657 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 710 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 1.2 KiB

@@ -276,6 +276,7 @@ function loadKLineData(city, region, name){
//option01.series[0].data = counts
option01.series[0].data = trends
curOption = option01;
var myChart01 = echarts.init(document.getElementById('chart01'));
myChart01.setOption(option01,true);
// }else{
// option02.xAxis[0].data = times
+127 -68
View File
@@ -1,7 +1,7 @@
var city = ""
var myCollectCitys = [];
var lat;
var lng;
var lat = 31.222578;
var lng = 121.359555;
var allCity = []
var myDatasVue = new Vue({
el: '#contentTabDiv',
@@ -11,6 +11,13 @@ var myDatasVue = new Vue({
}
})
var citysVue = new Vue({
el: '#tabCityDiv',
data: {
citys:[]
}
})
var date = new Date();
var year = date.getFullYear()+'年';
var month = date.getMonth()+1+'月';
@@ -24,23 +31,7 @@ var month = date.getMonth()+1+'月';
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'
}
);
}
@@ -147,47 +138,69 @@ function loadMyCollectCity(){
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);
}));
myCollectCitys.push(curCity);
}
}
//myDatasVue.$data.cityDatas = ret;
}
if(myCollectCitys && myCollectCitys.length>0){
for(var j in myCollectCitys){
var curCity = myCollectCitys[j]
var m = 0;
axios.all([loadCityPriceInfo(curCity), detail(curCity), loadCityPricesAndCounts(curCity), loadHotDistrict(curCity)])
.then(axios.spread(function (acct, perms, trends, nearDists) {
var cityObj = new Object();
var data1 = acct.data.data
cityObj.hrefId = "tabQuotation"+(parseInt(m)+2)
cityObj.numId_up_chart = (parseInt(m)+1)+"_up_chart";
cityObj.numId_down_chart = (parseInt(m)+1)+"_down_chart";
cityObj.numId_price_chart = (parseInt(m)+1)+"_price_chart";
m = m + 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
}
var data4 = nearDists.data.data
if(data4){
var nears = []
for(var n in data4){
var v = data4[n]
var nearObj = new Object();
nearObj.city = v.city
nearObj.region = v.region
nearObj.name = v.name
nearObj.avgPrice = v.avgPrice
nears.push(nearObj);
}
cityObj.nears = nears
}
ret.push(cityObj);
myDatasVue.$data.cityDatas = ret;
}));
}
}
}).catch(function (error) {
@@ -209,14 +222,11 @@ 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)
function loadHotDistrict(city){
return axios.get("/rest/districts/hotDistricts?city="+city+"&top=5")
}
$(".button").click(function(){
console.log("type:"+$(this).text())
var type = (this).attr("v")
var city = (this).attr("city")
function clickTrend(city, type, num){
axios.get("/rest/quotations/loadCityPriceTrends", {
params: {
city: city,
@@ -224,7 +234,7 @@ $(".button").click(function(){
}
}).then(function (response) {
var datas = trends.data.data
var datas = response.data.data
var prices = []
var counts = []
var times = datas.times
@@ -234,20 +244,32 @@ $(".button").click(function(){
var pm = datas.cityPriceMap;
var cm = datas.countMap;
if(pm){
prices.push(pm[time])
if(pm[time]){
prices.push(pm[time])
}else{
prices.push(null)
}
}
if(cm){
counts.push(cm[time]);
if(cm[time]){
counts.push(cm[time]);
}else{
counts.push(null);
}
}
}
showChart(num+"_price_chart", obj.times, prices, counts)
$("div[tid='"+num+"']").find("a").removeClass("active")
$("div[tid='"+num+"']").find("a[v='"+type+"']").addClass("active")
showChart(num+"_price_chart", times, prices, counts)
}).catch(function (error) {
alert(error)
console.log(error);
});
})
}
function IsInArray(arr, val){
@@ -261,14 +283,32 @@ function loadChart(){
var d2 = allCity.length;
if(d2>0 && d2==d1){
loadTabCity();
loadUpOrDownChart();
loadTrends();
window.clearInterval(t1);
}
}
function loadTabCity(){
var datas = myDatasVue.$data.cityDatas
var citys = []
for(var i in datas){
var obj = datas[i]
var numObj = new Object();
numObj.hrefId = "tabQuotation"+(parseInt(i)+2)
numObj.city = obj.city
citys.push(numObj)
}
citysVue.$data.citys = citys;
}
function loadUpOrDownChart(){
var datas = myDatasVue.$data.cityDatas
for(var i in datas){
@@ -421,3 +461,22 @@ function showChart(idDom, categories, prices, counts){
}]
});
}
function showDistrictDetail(index, city){
var datas = myDatasVue.$data.cityDatas
if(datas){
for(var i in datas){
var obj = datas[i]
if(obj.name == city){
var dists = obj.nears
var dm = dists[index]
clicked('../district/detail.html',true,false,{},{city:dm.city,region:dm.region,name:dm.name});
}
}
}
}
function showRegionInfo(city){
}
File diff suppressed because one or more lines are too long
+141
View File
@@ -0,0 +1,141 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>上海各区县涨跌排行</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
</head>
<body>
<div class="page-group">
<div class="page page-current" id="regionInfo">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<h1 class="title">{{city}}各区县涨跌排行</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox">
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="(info,index) in regionInfos" v-if="index < 3">
<div class="card-header">{{info.region}}<img v-if="index == 0" src="../../images/rankingImg01.png"><img v-if="index == 1" src="../../images/rankingImg02.png"><img v-if="index == 2" src="../../images/rankingImg03.png"></div>
<div class="card-content">
<div class="card-content-inner">{{info.avgPrice}}元/㎡</div>
</div>
<div class="card-footer" v-if="info.oneMonthUpDownRange >0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="card-footer" v-else=""><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
</div>
</div>
</div>
<div class="list-block media-list cityList">
<ul class="list-container">
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-10">&nbsp;</div>
<div class="col-25">区县</div>
<div class="col-33">{{month}}月均价</div>
<div class="col-25">近30天涨跌幅</div>
</div>
</div>
</a>
</li>
<li v-for="(info,index) in regionInfos">
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-10">{{index+1}}</div>
<div class="col-25">{{info.region}}</div>
<div class="col-33">{{info.avgPrice}}元/㎡</div>
<div class="col-25" v-if="info.oneMonthUpDownRange > 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../config.js"></script>
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
var date = new Date();
var month = date.getMonth()+1;
var regionsInfoVue = new Vue({
el: '#regionInfo',
data: {
city:"",
month:month,
regionInfos : []
}
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
var city = self.city
regionsInfoVue.$data.city = city;
loadRegionInfo(city);
}
//loadRegionInfo("上海");
function loadRegionInfo(city){
axios.get("/rest/quotations/regionInfos",{
params:{
city : city
}
}).then(function (response) {
var msg = response.data.data;
if(msg){
for(var i in msg){
var da = msg[i]
da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2)
}
regionsInfoVue.$data.regionInfos = msg;
}
})
.catch(function (error) {
console.log(error);
});
}
</script>
</body>
</html>
+1 -1
View File
@@ -282,7 +282,7 @@
<div class="swiper-slide" v-for="(myCityMap,index) in cityDatas">
<div v-for="(myCityMap,index) in cityDatas">
<div class="card cardPrice cardPrice01 cardCity01">
<div class="card-header">
<label>{{myCityMap.city}}</label>