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

# Conflicts:
#	fangija-zsyf/css/main.css
This commit is contained in:
bayi
2018-05-14 20:19:23 +08:00
13 changed files with 335 additions and 18 deletions
+6 -1
View File
@@ -12,9 +12,13 @@ em{font-style:normal;color:#333;}
em.up{color:#EB5F34;}
em.down{color:#88D053;}
*/
::-webkit-scrollbar{display:none;}
.bt{border-top:solid 0.5rem #f3f3f3;}
.bb{border-bottom:solid 0.5rem #f3f3f3;}
::../../images{display:none;}
.tac{text-align:center;}
.dn{display:none;}
.di{display:inline;}
@@ -953,7 +957,8 @@ input::-webkit-input-placeholder{
.cardCity01 .card-header label{font-size:1rem;color:#333;}
.cardCity01 .card-header .button{top:0.6rem;}
.cardCity01 .card-content-inner{padding-bottom:5rem;}
.cardCity01 .card-footer{bottom:1rem;}
.cardCity01 .card-footer{bottom:1.5rem;}
.cardCity02{background:url(../images/rankingBg.png) no-repeat center 5rem;background-size:100%;padding:0 0.75rem;padding-top:2.5rem;padding-bottom:0.8rem;border-bottom:none;position:relative;}
.cardCity02 .card-footer{background:rgba(255,255,255,0.7);border:solid 1px #e7e7e7;border-radius:0.4rem;padding-top:1.5rem;padding-bottom:0.5rem;bottom:0;}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

+17
View File
@@ -641,6 +641,23 @@ function docollectCity(city, type){
});
}
function loadCityReport(city){
axios.get('/rest/quotations/loadCityReport',{params:{city:city}}).then(function(response){
if(response.status){
var cityReport = response.data.data;
cityInfoVue.cityReport = cityReport;
}
}).catch(function(error){console.log(error)});
}
function paramCheck(param){
if(typeof(param)=="undefined"||param==null||$.trim(param)==""){
return false
}else{
return true
}
}
+20
View File
@@ -0,0 +1,20 @@
//定义对象
var assetsLevel = new Vue({
el: '#assetsLevel',
data: {
level: "",//排名
name: "",//昵称(有昵称显示昵称,没昵称显示手机号)
assets: ""//总资产
}
})
function getAssetsLevelDetail(){
}
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
//初始化数据
getAssetsLevelDetail();
}
+116 -3
View File
@@ -100,7 +100,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>{{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>
<div class="topicContent" style="padding:0;">
@@ -166,7 +278,8 @@ function onPlusReady() {
month:month,
collecd:false,
nears:[],
myCityMap : []
myCityMap : [],
cityReport: []
}
});
cityInfoVue.$data.city = city;
@@ -175,7 +288,7 @@ function onPlusReady() {
loadUpOrDown(city);
loadHotDistrict(city)
loadCityPricesAndCounts(city)
loadCityReport(city)
}
+22 -8
View File
@@ -17,12 +17,13 @@
.list-block ul:before{height:0;}
.icon-houseLevel{width:0.8rem;height:0.75rem;background:url(../../images/icon-houseLevel.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:-0.1rem;}
.cardPrice01 .card-content{background:url(../../images/cardBg01.png) no-repeat center bottom;background-size:100%;}
.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 0.75rem;}
.list-block .add01{padding:0 0.5rem;top:1.1rem;right:0.75rem;}
.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;}
.list-block .item-title em{font-size:0.8rem;color:#EB5F34;}
.list-block .item-title .tag small{font-size:80%;color:#F5A100;}
.cardPrice01 .card-footer span:nth-child(2){text-align:center;}
.list-block ul:before{height:0;}
</style>
</head>
@@ -74,10 +75,10 @@
<em><strong>{{oneYearUpDownPrice}}</strong>万<i id="oneYearUpDownPrice" class="icon icon-arrow-red"></i></em>
<label>近1年升值额</label>
</span>
<!--<span>
<em><strong>待定</strong><i class="icon icon-arrow-red"></i></em>
<span onclick="gotoAssetsLevel()">
<em><strong>{{userAssetsLevel}}</strong></em>
<label>资产排名</label>
</span>-->
</span>
</div>
</div>
<div class="list-block media-list">
@@ -95,7 +96,8 @@
<div class="page-group" style="display: none;" id="page-group-login-temp"></div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
@@ -124,7 +126,8 @@ var baseInfo = new Vue({
data: {
totalPrice : "",
oneYearUpDownRange:"",
oneYearUpDownPrice: ""
oneYearUpDownPrice: "",
userAssetsLevel: ""
}
})
// 加载flag
@@ -183,6 +186,7 @@ function selectHouseInfoList(){
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap;
var houseInfoTotalMap = resultsMap.houseInfoTotalMap;
var userAssetsLevelMap = resultsMap.userAssetsLevelMap;
// 上次加载的序号
lastIndex = $('.list-container li').length;
//登录状态,但没有数据
@@ -222,7 +226,7 @@ function selectHouseInfoList(){
pageSize = resultsMap.houseInfoPageList.limit;
totalPages = resultsMap.houseInfoPageList.totalPages;
totalRecords = resultsMap.houseInfoPageList.totalRecords;
addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap);
addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap, userAssetsLevelMap);
}).catch(function (error) {
console.log(error);
});
@@ -271,6 +275,13 @@ function gotoAddHouse(){
})
}
//跳转资产排名
function gotoAssetsLevel(){
if(baseInfo.userAssetsLevel!="暂无"){
clicked('/views/user/assetsLevel.html',true,false,{},{},function(){})
}
}
//跳转房产详情
function gotoHouseDetail(id){
clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){
@@ -288,12 +299,15 @@ function gotoLoanApply(houseId, city){
}
/* 分页构造数据 */
function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap) {
function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap, userAssetsLevelMap) {
var html = '';
//控制总产值部分显示
baseInfo.totalPrice = houseInfoTotalMap["totalPrice"];
baseInfo.oneYearUpDownRange = Math.abs(houseInfoTotalMap["oneYearUpDownRange"]);
baseInfo.oneYearUpDownPrice = Math.abs(houseInfoTotalMap["oneYearUpDownPrice"]);
//资产排名(资产为0,不可点击)
baseInfo.userAssetsLevel = userAssetsLevelMap["userAssetsLevel"] == 0?"暂无":userAssetsLevelMap["userAssetsLevel"];
if(!isNaN(houseInfoTotalMap["oneYearUpDownRange"])){
//涨跌幅大于零
if(parseFloat(houseInfoTotalMap["oneYearUpDownRange"])>=0){
+148
View File
@@ -0,0 +1,148 @@
<!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="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
.list-block.cityList ul.list-container > div .item-subtitle div{color:#999;}
.list-block.cityList .item-subtitle div:first-child{margin-left:0;}
.list-block.cityList .item-subtitle div.col-20{position:relative;height:1.1rem;}
.list-block.cityList .item-subtitle div.col-20:last-child em{color:#F18D00;}
.list-block.cityList .item-subtitle div.col-20 .button{width:auto;height:1.1rem;top:0;left:0;right:inherit;font-style:normal;line-height:1rem;}
.list-block.cityList .item-subtitle div.col-25 .star .icon{margin-right:0;}
.list-block.cityList .item-subtitle div img{width:1rem;margin:0 auto;}
.list-block.cityList > p{font-size:0.7rem;color:#999;text-align:center;}
</style>
</head>
<body>
<div class="page-group">
<div class="page page-current">
<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>
<!--<button class="button button-link button-nav pull-right">
<span class="icon icon-share"></span>
</button>-->
<h1 class="title">用户资产排名</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="card cardPrice cardCity cardCity02" id="assetsLevel" v-cloak>
<div class="card-footer">
<span>
<em><strong>{{level}}</strong></em>
<label>排名</label>
</span>
<span>
<em><strong>{{name}}</strong></em>
</span>
<span>
<em><strong>{{assets}}</strong>万元</em>
<label>资产总额</label>
</span>
<img src="../../images/rankingCup05.png">
</div>
</div>
<div class="list-block media-list cityList">
<ul class="list-container">
<div class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-20 tac">排名</div>
<div class="col-40">用户</div>
<div class="col-40">资产总额</div>
</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>
</div>
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/beacon_release.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7-2.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.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/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script type="text/javascript" src="../../js/user/assetsLevel.js" charset="utf-8"></script>
</body>
</html>
+6 -6
View File
@@ -483,12 +483,12 @@ $(document).on("click",".confirm-ok", function () {
function initMyHouseParams(){
mh_loading = false;
mh_page = undefined;
var mh_pageSize = undefined;
var mh_totalPages = undefined;
var mh_totalRecords = undefined;
var mh_lastIndex = undefined;
var mh_itemsPerLoad = undefined;
var mh_maxItems = 100;
mh_pageSize = undefined;
mh_totalPages = undefined;
mh_totalRecords = undefined;
mh_lastIndex = undefined;
mh_itemsPerLoad = undefined;
mh_maxItems = 100;
//清空构造的container
$('#myhouse').html('');
// 删除加载提示符