Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2

This commit is contained in:
bayi
2018-05-15 14:50:16 +08:00
5 changed files with 200 additions and 172 deletions
+26 -1
View File
@@ -641,6 +641,7 @@ function docollectCity(city, type){
});
}
//加载城市报告
function loadCityReport(city){
axios.get('/rest/quotations/loadCityReport',{params:{city:city}}).then(function(response){
if(response.status){
@@ -650,6 +651,7 @@ function loadCityReport(city){
}).catch(function(error){console.log(error)});
}
//城市报告参数校验
function paramCheck(param){
if(typeof(param)=="undefined"||param==null||$.trim(param)==""){
return false
@@ -657,7 +659,30 @@ function paramCheck(param){
return true
}
}
//城市报告参数过滤
function paramFilter(param){
if(typeof(param)=="undefined"||param==null||$.trim(param)==""){
return "暂无"
}else{
return param
}
}
//城市报告参数截取
function paramDivisionHead(param){
if(paramCheck(param)){
return param.substring(0,param.indexOf("(")==-1?param.indexOf("("):param.indexOf("("));
}else{
return "暂无"
}
}
//城市报告参数截取
function paramDivisionTail(param){
if(paramCheck(param)){
return param.substring(param.indexOf("(")==-1?param.indexOf("("):param.indexOf("("));
}else{
return ""
}
}
+50 -4
View File
@@ -8,13 +8,59 @@ var assetsLevel = new Vue({
}
})
function getAssetsLevelDetail(){
//用户资产排名查询请求
function initAssetsLevelDetail(){
//清空ui下的li元素
$('.list-container').children("li").remove();
axios.get(BASE_PATH + "/rest/userAssetsLevel/list",
{
params: {}
}).then(function (response) {
var resultsMap = response.data.data;
var resultList = resultsMap.userAssetsLevelList;
var userAssetsLevel = resultsMap.userAssetsLevel;
//父页面已经判断处理, 这里不用考虑数据不存在的情况
if(resultList != null && resultList.length > 0){
addItems(resultList, userAssetsLevel);
}
//数据加载完成隐藏loading效果
$('#loading').hide();
$('#pageContent').show();
}).catch(function (error) {
console.log(error);
});
}
/* 分页构造数据 */
function addItems(resultList, userAssetsLevel) {
var htmlContent = "";
//控制个人部分显示
assetsLevel.level = userAssetsLevel.level;
assetsLevel.name = userAssetsLevel.name;
assetsLevel.assets = userAssetsLevel.assets;
for(var i in resultList) {
var result = resultList[i];
htmlContent += "<li><a class='item-content'><div class='item-inner'>";
htmlContent += "<div class='item-subtitle row'><div class='col-20 tac'>";
if(i == 0){
htmlContent += "<img src='../../images/rankingImg01a.png'></div>";
}else if(i == 1){
htmlContent += "<img src='../../images/rankingImg02a.png'></div>";
}else if(i == 2){
htmlContent += "<img src='../../images/rankingImg03a.png'></div>";
}else{
htmlContent += Number(i)+1+"</div>";
}
htmlContent += "<div class='col-40'>"+result.name+"</div>";
htmlContent += "<div class='col-40'>"+result.assets+"万元</div>";
htmlContent += "</div></div></a></li>";
}
$('.list-container').append(htmlContent);
}
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
//初始化数据
getAssetsLevelDetail();
}
initAssetsLevelDetail();
}
-113
View File
@@ -100,118 +100,6 @@
<div class="chart" id="price_chart"></div>
</div>
</div>
<div class="topic">
<div class="topicTitle topicTitle03"><img src="images/lineImg.png">城市报告<img src="images/lineImg.png"></div>
<div class="topicContent" style="padding:0;padding-bottom:0.5rem;">
<div class="content-block content-block01 content-block01a" style="padding-bottom:0.5rem;">
<div class="buttons-row theme">
<a href="#tabCityReport1" class="tab-link button active">人口</a>
<a href="#tabCityReport2" class="tab-link button">经济</a>
<a href="#tabCityReport3" class="tab-link button">景点/高校</a>
<a href="#tabCityReport4" class="tab-link button">气候</a>
<a href="#tabCityReport5" class="tab-link button">交通</a>
</div>
</div>
<div class="tabs">
<div id="tabCityReport1" class="tab active">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">总人口:<em>{{if(paramCheck(population)){population}else{"暂无"}}}</em><small>(2017年常住人口)</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">面积:<em>6340k㎡</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">发展指数:<em>0.852</em><small>(极高,2014年)</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">行政区级别:<em>直辖市</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport2" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">生产总值:<em>30133.86亿元</em><small>(2017年)</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">人均生产总值:<em>124536元</em><small>(2017年)</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">人均支配收入:<em>58988元</em><small>(2017年)</small></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport3" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">著名景点:<em>外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">著名高校:<em>复旦、交大、同济、华东师大等</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport4" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">气候条件:<em>亚热带季风气候</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">地理位置:<em>长江入海口南岸,东海之滨</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport5" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">机场:<em>上海虹桥国际机场、上海浦东国际机场</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">火车站:<em>上海站、上海虹桥站、上海南站</em></div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="topic">
<div class="topicTitle">热门小区</div>
@@ -288,7 +176,6 @@ function onPlusReady() {
loadUpOrDown(city);
loadHotDistrict(city)
loadCityPricesAndCounts(city)
loadCityReport(city)
}
+116 -3
View File
@@ -238,7 +238,119 @@
<div class="chart" id="price_chart"></div>
</div>
</div>
<div class="topic">
<div class="topicTitle topicTitle03"><img src="../../images/lineImg.png">城市报告<img src="../../images/lineImg.png"></div>
<div class="topicContent" style="padding:0;padding-bottom:0.5rem;">
<div class="content-block content-block01 content-block01a" style="padding-bottom:0.5rem;">
<div class="buttons-row theme">
<a href="#tabCityReport1" class="tab-link button active">人口</a>
<a href="#tabCityReport2" class="tab-link button">经济</a>
<a href="#tabCityReport3" class="tab-link button">景点/高校</a>
<a href="#tabCityReport4" class="tab-link button">气候</a>
<a href="#tabCityReport5" class="tab-link button">交通</a>
</div>
</div>
<div class="tabs">
<div id="tabCityReport1" class="tab active">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">总人口:<em>{{paramDivisionHead(cityReport.population)}}</em><small>{{paramDivisionTail(cityReport.population)}}</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">面积:<em>{{paramFilter(cityReport.area)}}</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">发展指数:<em>{{paramDivisionHead(cityReport.humanDevelopmentIndex)}}</em><small>{{paramDivisionTail(cityReport.humanDevelopmentIndex)}}</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">行政区级别:<em>{{paramFilter(cityReport.administrativeDivision)}}</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport2" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">生产总值:<em>{{paramDivisionHead(cityReport.grp)}}</em><small>{{paramDivisionTail(cityReport.GRP)}}</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">人均生产总值:<em>{{paramDivisionHead(cityReport.gnpp)}}</em><small>{{paramDivisionTail(cityReport.GNPP)}}</small></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">人均支配收入:<em>{{paramDivisionHead(cityReport.perCapitaIncome)}}</em><small>{{paramDivisionTail(cityReport.perCapitaIncome)}}</small></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport3" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">著名景点:<em>{{paramFilter(cityReport.famousScenery)}}</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">著名高校:<em>{{paramFilter(cityReport.famousUniversities)}}</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport4" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">气候条件:<em>{{paramFilter(cityReport.weatherConditions)}}</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">地理位置:<em>{{paramFilter(cityReport.geographicPosition)}}</em></div>
</div>
</li>
</ul>
</div>
</div>
<div id="tabCityReport5" class="tab">
<div class="list-block dataList">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-text">机场:<em>{{paramFilter(cityReport.airport)}}</em></div>
</div>
</li>
<li class="item-content">
<div class="item-inner">
<div class="item-text">火车站:<em>{{paramFilter(cityReport.railwayStation)}}</em></div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="topic">
<div class="topicTitle">热门小区</div>
<div class="topicContent" style="padding:0;">
@@ -1245,7 +1357,8 @@ $.config = {router: false}
month:month,
collecd:false,
nears:[],
myCityMap : []
myCityMap : [],
cityReport:{}
}
});
@@ -1555,7 +1668,7 @@ function clickCity(val){
loadUpOrDown(city);
loadHotDistrict(city)
loadCityPricesAndCounts(city)
loadCityReport(city)
$("#trendDiv a").removeClass("active")
$("#trendDiv a[v='2']").addClass("active")// 默认走势显示半年
+8 -51
View File
@@ -28,7 +28,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
@@ -37,11 +37,11 @@
</button>-->
<h1 class="title">用户资产排名</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50" id="pageContent" style="display: none;">
<div class="card cardPrice cardCity cardCity02" id="assetsLevel" v-cloak>
<div class="card-footer">
<span>
<em><strong>{{level}}</strong></em>
<em><strong>NO.{{level}}</strong></em>
<label>排名</label>
</span>
<span>
@@ -65,59 +65,16 @@
</div>
</div>
</div>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-20 tac"><img src="../../images/rankingImg01a.png"></div>
<div class="col-40">137****6586</div>
<div class="col-40">2300万元</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-20 tac"><img src="../../images/rankingImg02a.png"></div>
<div class="col-40">137****6586</div>
<div class="col-40">1800万元</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-20 tac"><img src="../../images/rankingImg03a.png"></div>
<div class="col-40">137****6586</div>
<div class="col-40">1600万元</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-20 tac">4</div>
<div class="col-40">137****6586</div>
<div class="col-40">1500万元</div>
</div>
</div>
</a>
</li>
<!-- 动态构造数据部分 -->
</ul>
<!--<p>上拉查看更多排名</p>-->
<!-- <p>没有更多数据</p> -->
</div>
<!-- 加载提示符 -->
<!--<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>-->
</div>
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader" id="loading" style="display: block;">
<div class="preloader"></div>
</div>
</div>
</div>