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

This commit is contained in:
xuhe@fangjia.com
2018-05-17 15:09:24 +08:00
6 changed files with 663 additions and 98 deletions
+12 -20
View File
@@ -12,7 +12,13 @@
<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">
<style>
.list-block.cityList > p {
font-size: 0.7rem;
color: #999;
text-align: center;
}
</style>
</head>
<body>
@@ -102,7 +108,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -113,7 +119,7 @@ $.config = {router: false}
month : month,
end : false,
list:[]
},
}/*,
methods: {
menu:function() {
if(this.end){
@@ -133,13 +139,14 @@ $.config = {router: false}
},
mounted:function() {
window.addEventListener('scroll', this.menu());
}
}*/
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
updateSerivces();
/*axios.get("/rest/quotations/queryMarkDownTopByPage", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
.then(function (response) {
tableList.month = month;
@@ -171,17 +178,6 @@ $(function() {
// 每次加载添加多少条目
var itemsPerLoad = 10;
/*function addItems(number, lastIndex) {
// 生成新条目的HTML
var html = '';
for (var i = lastIndex + 1; i <= lastIndex + number; i++) {
html += '<li><a class="item-content"><div class="item-inner"><div class="item-subtitle row"><div class="col-15 tac">' + i + '</div><div class="col-25">上海</div><div class="col-33">15689元/㎡</div><div class="col-25"><em class="up">8.98%<i class="icon icon-arrow-green"></i></em></div></div></div></a></li>';
}
// 添加新条目
$('.list-block.cityList ul').append(html);
}*/
function addItems(pageNo,pageSize){
axios.get("/rest/quotations/queryMarkDownTopByPage", {params:{pageNo:pageNo,pageSize:pageSize}})
@@ -199,8 +195,7 @@ $(function() {
}
//预先加载10条
//addItems(itemsPerLoad, 0);
//addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
@@ -219,7 +214,6 @@ $(function() {
// 重置加载flag
loading = false;
//if (lastIndex >= maxItems) {
if(tableList.end){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
@@ -229,8 +223,6 @@ $(function() {
}
// 添加新条目
//addItems(itemsPerLoad, lastIndex);
//addItems(pNo, itemsPerLoad);
addItems(pageBean.pageNo, pageBean.pageSize);
// 更新最后加载的序号
lastIndex = $('.list-block.cityList ul li').length;
+24 -11
View File
@@ -12,7 +12,17 @@
<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">
<style>
.list-block.cityList > p {
font-size: 0.7rem;
color: #999;
text-align: center;
}
.list-block.cityList .item-subtitle div img {
width: 1rem;
margin: 0 auto;
}
</style>
</head>
<body>
@@ -93,7 +103,6 @@
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
@@ -114,7 +123,6 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
var date = new Date();
var month = date.getMonth()+1+'月';
@@ -145,14 +153,14 @@ $.config = {router: false}
city:'上海',
markup:9.0,
list:[]
},
}/*,
methods: {
menu:function() {
if(this.end){
console.log("已显示全部");
this.end = true;
}else{
axios.get("/rest/quotations/queryMarkUpAndDownByPage", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
axios.get("/rest/quotations/queryMarkUpTopByPage", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
.then(function (response) {
this.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
@@ -170,13 +178,14 @@ $.config = {router: false}
},
mounted:function() {
window.addEventListener('scroll', this.menu());
}
}*/
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
updateSerivces();
}
@@ -202,21 +211,26 @@ $(function() {
var itemsPerLoad = 10;
function addItems(pageNo,pageSize){
axios.get("/rest/quotations/queryMarkUpAndDownByPage", {params:{pageNo:pageNo,pageSize:pageSize}})
axios.get("/rest/quotations/queryMarkUpTopByPage", {params:{pageNo:pageNo,pageSize:pageSize}})
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
}
pageBean.pageNo=pageBean.pageNo+1;
})
.catch(function (error) {
console.log(error);
});
}
//预先加载10条
addItems(pageBean.pageNo, pageBean.pageSize);
// 上次加载的序号
var lastIndex = 10;
var pNo=2;
// 注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
@@ -241,9 +255,8 @@ $(function() {
}
// 更新最后加载的序号
addItems(pNo,itemsPerLoad);
addItems(pageBean.pageNo, pageBean.pageSize);
lastIndex = $('.list-block.cityList ul li').length;
pNo=lastIndex/itemsPerLoad+1;
//容器发生改变,如果是js滚动,需要刷新滚动
$.refreshScroller();
}, 1000);
@@ -0,0 +1,276 @@
<!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">
<style>
.list-block.cityList > p {
font-size: 0.7rem;
color: #999;
text-align: center;
}
.list-block.cityList .item-subtitle div img {
width: 1rem;
margin: 0 auto;
}
</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="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">城市均价排行</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50" id="tableList">
<div class="card cardPrice cardCity cardCity02">
<div class="card-footer">
<span>
<em><strong>{{avgPrice}}</strong>元/㎡</em>
<label>{{month}}月均价</label>
</span>
<span>
<em><strong>{{city}}</strong></em>
</span>
<span>
<em>
<strong>{{Math.abs(markup*100).toFixed(2)}}</strong>%
<i v-if="markup>=0" class="icon icon-arrow-red">
</i>
<i v-else class="icon icon-arrow-green">
</i>
</em>
<label>近30天涨跌幅</label>
</span>
<img src="../../images/rankingCup03.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-15 tac">排名</div>
<div class="col-25">城市</div>
<div class="col-33">{{month}}月均价</div>
<div class="col-25">近30天涨跌幅</div>
</div>
</div>
</div>
<li v-for="item in list">
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-15 tac">
<img v-if="item.rangeLevel==1" src="../../images/rankingImg01a.png">
<img v-else-if="item.rangeLevel==2" src="../../images/rankingImg02a.png">
<img v-else-if="item.rangeLevel==3" src="../../images/rankingImg03a.png">
<div v-else>{{item.rangeLevel}}</div>
</div>
<div class="col-25">{{item.city}}</div>
<div class="col-33">{{item.avgPrice}}元/㎡</div>
<div class="col-25" v-if="item.markup>=0">
<em class="up">{{Math.abs(item.markup*100).toFixed(2)}}%<i class="icon icon-arrow-red"></i></em>
</div>
<div class="col-25" v-else>
<em class="up">{{Math.abs(item.markup*100).toFixed(2)}}%<i class="icon icon-arrow-green"></i></em>
</div>
</div>
</div>
</a>
</li>
</ul>
<p v-if="end">没有更多数据</p>
<p v-else>上拉查看更多排名</p>
<!-- <p>没有更多数据</p>-->
</div>
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</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/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/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></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>
var date = new Date();
var month = date.getMonth()+1+'月';
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityRankingAvgPrice";
var sharehrefTitle = "城市均价排行";
var sharehrefDes = "城市均价排行!";
var shareId='';
var picUrl = '../../images/default_share.png';
var hid = "";
var pageBean=new Vue({
data:{
pageNo:1,
pageSize:10
}
});
var tableList = new Vue({
el: '#tableList',
data: {
month : month,
end : false,
avgPrice:6.5,
city:'上海',
markup:9.0,
list:[]
}/*,
methods: {
menu:function() {
if(this.end){
console.log("已显示全部");
this.end = true;
}else{
axios.get("/rest/quotations/queryAvgPrice", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
.then(function (response) {
this.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo=1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
}
pageBean.pageNo=pageBean.pageNo+1;
}).catch(function (error) {
console.log(error);
});
}
}
},
mounted:function() {
window.addEventListener('scroll', this.menu());
}*/
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
updateSerivces();
}
function share(){
var eventType = "shareCityRankingClick";
var dataMap = {};
dataMap["hid"]=hid;
dataMap["type"]="house";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareHref();
}
//排行页面底部无限加载事件
$.init();
$(function() {
// 加载flag
var loading = false;
// 最多可加载的条目
var maxItems = 366;
// 每次加载添加多少条目
var itemsPerLoad = 10;
function addItems(pageNo,pageSize){
axios.get("/rest/quotations/queryAvgPrice", {params:{pageNo:pageNo,pageSize:pageSize}})
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
}
pageBean.pageNo=pageBean.pageNo+1;
})
.catch(function (error) {
console.log(error);
});
}
//预先加载10条
addItems(1, 10);
// 上次加载的序号
var lastIndex = 10;
// 注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
if(tableList.end){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').remove();
return;
}
// 更新最后加载的序号
addItems(pageBean.pageNo, pageBean.pageSize);
lastIndex = $('.list-block.cityList ul li').length;
//容器发生改变,如果是js滚动,需要刷新滚动
$.refreshScroller();
}, 1000);
});
});
</script>
</body>
</html>
@@ -0,0 +1,291 @@
<!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">
<style>
.list-block.cityList > p {
font-size: 0.7rem;
color: #999;
text-align: center;
}
.list-block.cityList .item-subtitle div img {
width: 1rem;
margin: 0 auto;
}
.list-block.cityList .item-subtitle div.col-25:last-child{width:23%;}
</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="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">城市潜力排行</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50" id="tableList">
<div class="card cardPrice cardCity cardCity02">
<div class="card-footer">
<span>
<em><strong>{{avgPrice}}</strong>元/㎡</em>
<label>{{month}}月均价</label>
</span>
<span>
<em><strong>{{city}}</strong></em>
</span>
<span>
<em>
<span class="star">
<i v-if="index>0&&index<15" class="icon icon-star02"></i>
<i v-if="index>=15" class="icon icon-star01"></i>
<i v-if="index>20&&index<35" class="icon icon-star02"></i>
<i v-if="index>=35" class="icon icon-star01"></i>
<i v-if="index>40&&index<55" class="icon icon-star02"></i>
<i v-if="index>=55" class="icon icon-star01"></i>
<i v-if="index>60&&index<75" class="icon icon-star02"></i>
<i v-if="index>=75" class="icon icon-star01"></i>
<i v-if="index>80&&index<95" class="icon icon-star02"></i>
<i v-if="index>=95" class="icon icon-star01"></i>
</span>
</em>
<label>潜力指数</label>
</span>
<img src="../../images/rankingCup02.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-15 tac">排名</div>
<div class="col-25">城市</div>
<div class="col-33">{{month}}月均价</div>
<div class="col-25">潜力指数</div>
</div>
</div>
</div>
<li v-for="item in list">
<a class="item-content">
<div class="item-inner">
<div class="item-subtitle row">
<div class="col-15 tac">
<img v-if="item.rangeLevel==1" src="../../images/rankingImg01a.png">
<img v-else-if="item.rangeLevel==2" src="../../images/rankingImg02a.png">
<img v-else-if="item.rangeLevel==3" src="../../images/rankingImg03a.png">
<div v-else>{{item.rangeLevel}}</div>
</div>
<div class="col-25">{{item.city}}</div>
<div class="col-33">{{item.avgPrice}}元/㎡</div>
<div class="col-25">
<span class="star">
<i v-if="item.index>0&&item.index<15" class="icon icon-star02"></i>
<i v-if="item.index>=15" class="icon icon-star01"></i>
<i v-if="item.index>20&&item.index<35" class="icon icon-star02"></i>
<i v-if="item.index>=35" class="icon icon-star01"></i>
<i v-if="item.index>40&&item.index<55" class="icon icon-star02"></i>
<i v-if="item.index>=55" class="icon icon-star01"></i>
<i v-if="item.index>60&&item.index<75" class="icon icon-star02"></i>
<i v-if="item.index>=75" class="icon icon-star01"></i>
<i v-if="item.index>80&&item.index<95" class="icon icon-star02"></i>
<i v-if="item.index>=95" class="icon icon-star01"></i>
</span>
</div>
</div>
</div>
</a>
</li>
</ul>
<p v-if="end">没有更多数据</p>
<p v-else>上拉查看更多排名</p>
<!-- <p>没有更多数据</p>-->
</div>
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</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/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/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></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>
var date = new Date();
var month = date.getMonth()+1+'月';
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityRankingPotential";
var sharehrefTitle = "城市潜力排行";
var sharehrefDes = "城市潜力排行!";
var shareId='';
var picUrl = '../../images/default_share.png';
var hid = "";
var pageBean=new Vue({
data:{
pageNo:1,
pageSize:10
}
});
var tableList = new Vue({
el: '#tableList',
data: {
month : month,
end : false,
avgPrice:6.5,
city:'上海',
index:100,
list:[]
}/*,
methods: {
menu:function() {
if(this.end){
console.log("已显示全部");
this.end = true;
}else{
axios.get("/rest/quotations/queryPotential", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
.then(function (response) {
this.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo=1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
}
pageBean.pageNo=pageBean.pageNo+1;
}).catch(function (error) {
console.log(error);
});
}
}
},
mounted:function() {
window.addEventListener('scroll', this.menu());
}*/
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
updateSerivces();
}
function share(){
var eventType = "shareCityRankingClick";
var dataMap = {};
dataMap["hid"]=hid;
dataMap["type"]="house";
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
shareHref();
}
//排行页面底部无限加载事件
$.init();
$(function() {
// 加载flag
var loading = false;
// 最多可加载的条目
var maxItems = 366;
// 每次加载添加多少条目
var itemsPerLoad = 10;
function addItems(pageNo,pageSize){
axios.get("/rest/quotations/queryPotential", {params:{pageNo:pageNo,pageSize:pageSize}})
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.index = response.data.data.list[0].index;
}
pageBean.pageNo=pageBean.pageNo+1;
})
.catch(function (error) {
console.log(error);
});
}
//预先加载10条
addItems(1, 10);
// 上次加载的序号
var lastIndex = 10;
// 注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
if(tableList.end){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').remove();
return;
}
// 更新最后加载的序号
addItems(pageBean.pageNo, pageBean.pageSize);
lastIndex = $('.list-block.cityList ul li').length;
//容器发生改变,如果是js滚动,需要刷新滚动
$.refreshScroller();
}, 1000);
});
});
</script>
</body>
</html>
+24 -45
View File
@@ -12,6 +12,13 @@
<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">
<style>
.list-block.cityList > p {
font-size: 0.7rem;
color: #999;
text-align: center;
}
</style>
</head>
@@ -103,7 +110,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -114,7 +121,7 @@ $.config = {router: false}
month : month,
end : false,
list:[]
},
}/*,
methods: {
menu:function() {
if(this.end){
@@ -125,7 +132,7 @@ $.config = {router: false}
.then(function (response) {
this.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
//pageBean.pageNo=pageBean.pageNo+1;
pageBean.pageNo=pageBean.pageNo+1;
}).catch(function (error) {
console.log(error);
});
@@ -134,23 +141,14 @@ $.config = {router: false}
},
mounted:function() {
window.addEventListener('scroll', this.menu());
}
}*/
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
hid = self.hid;
/*axios.get("/rest/quotations/queryMarkUpTopByPage", {params:{pageNo:pageBean.pageNo,pageSize:pageBean.pageSize}})
.then(function (response) {
tableList.month = month;
tableList.end = response.data.data.end;
tableList.list = response.data.data.list;
pageBean.pageNo=pageBean.pageNo+1;
})
.catch(function (error) {
console.log(error);
});*/
updateSerivces();
}
function share(){
@@ -162,6 +160,7 @@ function share(){
shareHref();
}
//排行页面底部无限加载事件
$.init();
$(function() {
@@ -173,41 +172,24 @@ $(function() {
// 每次加载添加多少条目
var itemsPerLoad = 10;
/*function addItems(number, lastIndex) {
// 生成新条目的HTML
var html = '';
for (var i = lastIndex + 1; i <= lastIndex + number; i++) {
html += '<li><a class="item-content"><div class="item-inner"><div class="item-subtitle row"><div class="col-15 tac">' + i + '</div><div class="col-25">上海</div><div class="col-33">15689元/㎡</div><div class="col-25"><em class="up">8.98%<i class="icon icon-arrow-red"></i></em></div></div></div></a></li>';
}
// 添加新条目
$('.list-block.cityList ul').append(html);
}*/
function addItems(pageNo,pageSize){
axios.get("/rest/quotations/queryMarkUpTopByPage", {params:{pageNo:pageNo,pageSize:pageSize}})
.then(function (response) {
tableList.end = response.data.data.end;
if(pageNo>1){
tableList.list = tableList.list.concat(response.data.data.list);
}else{
tableList.list = response.data.data.list;
}
pageBean.pageNo=pageBean.pageNo+1;
}).catch(function (error) {
console.log(error);
});
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
pageBean.pageNo=pageBean.pageNo+1;
})
.catch(function (error) {
console.log(error);
});
}
//预先加载10条
//addItems(itemsPerLoad, 0);
//addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
// 注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
// 如果正在加载,则退出
if (loading) return;
@@ -219,7 +201,7 @@ $(function() {
// 重置加载flag
loading = false;
if (lastIndex >= maxItems) {
if(tableList.end){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
@@ -227,17 +209,14 @@ $(function() {
return;
}
// 添加新条目
//addItems(itemsPerLoad, lastIndex);
addItems(pageBean.pageNo, pageBean.pageSize);
// 更新最后加载的序号
addItems(pageBean.pageNo,pageBean.pageSize);
lastIndex = $('.list-block.cityList ul li').length;
//容器发生改变,如果是js滚动,需要刷新滚动
$.refreshScroller();
}, 1000);
});
});
</script>
</body>
+36 -22
View File
@@ -90,33 +90,31 @@
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="item in datas">
<a v-if="item.type==0" href="cityRanking.html">
<a v-if="item.type==1" href="#">
<a v-if="item.type==2" href="#">
<div class="card-header" v-if="item.type==0">
<div class="card-header" v-if="item.type==0">
城市涨幅排行
</div>
<div class="card-header" v-else-if="item.type==1">
城市潜力排行
</div>
<div class="card-header" v-else-if="item.type==2">
城市均价排行
</div>
<div class="card-header"><em>①</em>{{item.city}}</div>
<div class="card-content">
</div>
<div class="card-header" v-if="item.type==0"><em>①</em>{{item.city}}</div>
<div class="card-content" v-if="item.type==0">
<div class="card-content-inner" v-if="item.type==0">
<em class="up">{{item.oneMonthUpDownRange*100}}%<i class="icon icon-arrow-red"></i></em>
</div>
<div class="card-content-inner" v-else-if="item.type==1">
</div>
<div class="card-footer">
<em>{{item.avgPrice}}元/㎡</em>
</div>
</a>
<a v-if="item.type==1" href="cityRankingPotential.html">
<div class="card-header" v-if="item.type==1">
城市潜力排行
</div>
<div class="card-header" v-if="item.type==1"><em>①</em>{{item.city}}</div>
<div class="card-content" v-if="item.type==1">
<div class="card-content-inner" v-if="item.type==1">
潜力指数
</div>
<div class="card-content-inner" v-else-if="item.type==2">
<em class="up">{{Math.abs(item.oneMonthUpDownRange*100).toFixed(2)}}%
<i class="icon icon-arrow-red" v-show="item.oneMonthUpDownRange>0"></i>
<i class="icon icon-arrow-green" v-show="item.oneMonthUpDownRange<0"></i>
</em>
</div>
</div>
<div class="card-footer" v-if="item.type==1">
<div class="card-footer" v-if="item.type==1">
<span class="star" v-if="item.index <=4">
<i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i><i class="icon icon-star"></i>
</span>
@@ -151,10 +149,26 @@
<i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i><i class="icon icon-star01"></i>
</span>
</div>
<div class="card-footer" v-else>
<em>{{item.avgPrice}}元/㎡</em>
</a>
<a v-if="item.type==2" href="cityRankingAvgPrice.html">
<div class="card-header" v-if="item.type==2">
城市均价排行
</div>
<div class="card-header" v-if="item.type==2"><em>①</em>{{item.city}}</div>
<div class="card-content" v-if="item.type==2">
<div class="card-content-inner" v-if="item.type==2">
<em class="up">{{Math.abs(item.oneMonthUpDownRange*100).toFixed(2)}}%
<i class="icon icon-arrow-red" v-show="item.oneMonthUpDownRange>0"></i>
<i class="icon icon-arrow-green" v-show="item.oneMonthUpDownRange<0"></i>
</em>
</div>
</div>
<div class="card-footer">
<em>{{item.avgPrice}}元/㎡</em>
</div>
</a>
</div>
</div>
</div>