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

This commit is contained in:
raoyanhui
2018-04-04 17:17:40 +08:00
2 changed files with 283 additions and 232 deletions
@@ -183,7 +183,7 @@ $.config = {router: false}
if($(event.target).hasClass("theme")){
return;
}
return;
//return;
axios.post("/rest/evaluate/feedBack",{
hid:hid,
reason:i
+282 -231
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>我的关注</title>
<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">
@@ -11,7 +11,15 @@
<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-blue.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
.topic .topicContent .topicContent_center.home div .icon{width:42px;height:42px;}
.topic .topicContent .topicContent_center.home div span{font-size:0.7rem;color:#666;}
.buttons-tab .button{font-size:0.75rem;color:#999;line-height:2.5rem;height:2.5rem;}
.list-block ul:before{height:0;}
.cardInfo:first-child{border-top:none;}
</style>
</head>
@@ -19,51 +27,280 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<nav class="bar bar-tab">
<a class="tab-item external" href="01_index.html">
<span class="icon iconfont icon-tab01"></span>
<span class="tab-label">首页</span>
</a>
<a class="tab-item external" href="02_quotation01_country.html">
<span class="icon iconfont icon-tab02"></span>
<span class="tab-label">行情</span>
</a>
<a class="tab-item external" href="03_evaluation01_index.html">
<span class="icon iconfont icon-tab03"></span>
<span class="tab-label">评估</span>
</a>
<a class="tab-item external active" href="05_mine01_index.html">
<span class="icon iconfont icon-tab04"></span>
<span class="tab-label">我的</span>
</a>
</nav>
<header class="bar bar-nav theme">
<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 open-popover">
<span class="icon icon-path"></span>
</button> -->
<h1 class="title">我的关注</h1>
<button class="button button-link button-nav pull-right" onclick="window.location.href='05_mine05_set01_index.html'">
<span class="icon icon-set"></span>
</button>
</header>
<div class="bar bar-header-secondary">
<div class="buttons-row theme">
<a href="#tab1" class="tab-link button active">小区</a>
<a href="#tab2" class="tab-link button">城市</a>
</div>
</div>
<div class="content contentSuggest infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="tabs">
<div id="tab1" class="tab active">
<div class="content-block content-block01">
<div class="list-block media-list">
<ul class="list-container" id="ulTab1">
</ul>
<div class="content">
<div class="topBg01">
<img src="../../images/headPortrait.png">
<p>137****6586<br><span class="tag"><small>土豪</small></span></p>
</div>
<div class="topic">
<div class="topicContent" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<!-- 加载提示符 -->
<div id="loadTip1" class="infinite-scroll-preloader">
<div class="preloader"></div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='01_index02_selectHouse01_index.html'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>
</div>
<div id="tab2" class="tab">
<div class="content-block content-block01">
<div class="list-block media-list">
<ul class="list-container" id="ulTab2">
</ul>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab">
<a href="#tabList1" class="tab-link button">房产(3)</a>
<a href="#tabList2" class="tab-link button active">关注({{mf_num}})</a>
<a href="#tabList3" class="tab-link button">收藏(2)</a>
<a href="#tabList4" class="tab-link button">消息(2)</a>
</div>
<div class="tabs">
<div id="tabList1" class="tab">
<div class="list-block media-list">
<ul>
<li>
<a href="03_evaluation03_report.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">龙盛佳苑 <em>391万</em><span class="tag"><small>空置</small></span></div>
</div>
<div class="item-subtitle">
<div>近30天涨跌幅: <em class="down">3.37%<i class="icon icon-arrow-green"></i></em></div>
<div>下跌概率: <em class="down">12%<i class="icon icon-arrow-green"></i></em></div>
<div>抵押可贷额度: <em style="color:#EB5F34;">391万</em></div>
</div>
</div>
</a>
<a class="button theme add add01 add01a" href="">立即申请</a>
</li>
<li>
<a href="03_evaluation03_report.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">龙盛佳苑 <em>391万</em><span class="tag"><small>空置</small></span></div>
</div>
<div class="item-subtitle">
<div>近30天涨跌幅: <em class="down">3.37%<i class="icon icon-arrow-green"></i></em></div>
<div>下跌概率: <em class="down">12%<i class="icon icon-arrow-green"></i></em></div>
<div>抵押可贷额度: <em style="color:#EB5F34;">391万</em></div>
</div>
</div>
</a>
<a class="button theme add add01 add01a" href="">立即申请</a>
</li>
<li>
<a href="03_evaluation03_report.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">龙盛佳苑 <em>391万</em><span class="tag"><small>空置</small></span></div>
</div>
<div class="item-subtitle">
<div>近30天涨跌幅: <em class="down">3.37%<i class="icon icon-arrow-green"></i></em></div>
<div>下跌概率: <em class="down">12%<i class="icon icon-arrow-green"></i></em></div>
<div>抵押可贷额度: <em style="color:#EB5F34;">391万</em></div>
</div>
</div>
</a>
<a class="button theme add add01 add01a" href="">立即申请</a>
</li>
</ul>
</div>
</div>
<div id="tabList2" class="tab active">
<div class="list-block media-list">
<ul class="list-container" id="mf_ul">
<li>
<a href="01_index04_districtDetail.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">工贸小区</div>
<div class="item-after"><em>¥61000元/㎡</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><i class="icon icon-address03"></i><small>上海市长宁区广顺路33号</small></div>
<div class="item-after"><span>距您10m</span></div>
</div>
<div class="item-subtitle">
<div>潜力指数: <span class="star"><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>近30天涨跌幅: <em class="down">0.56%<i class="icon icon-arrow-green"></i></em></div>
</div>
<div class="item-subtitle"><span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span></div>
</div>
</a>
</li>
<li>
<a href="01_index04_districtDetail.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">广顺小区</div>
<div class="item-after"><em>¥54886元/㎡</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><i class="icon icon-address03"></i><small>上海市长宁区广顺路32弄</small></div>
<div class="item-after"><span>距您98m</span></div>
</div>
<div class="item-subtitle">
<div>潜力指数: <span class="star"><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>近30天涨跌幅: <em class="down">0.56%<i class="icon icon-arrow-green"></i></em></div>
</div>
<div class="item-subtitle"><span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span></div>
</div>
</a>
</li>
<li>
<a href="01_index04_districtDetail.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">定威小区</div>
<div class="item-after"><em>¥55636元/㎡</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><i class="icon icon-address03"></i><small>上海市长宁区定威路28弄</small></div>
<div class="item-after"><span>距您117m</span></div>
</div>
<div class="item-subtitle">
<div>潜力指数: <span class="star"><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>近30天涨跌幅: <em class="down">0.56%<i class="icon icon-arrow-green"></i></em></div>
</div>
<div class="item-subtitle"><span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span></div>
</div>
</a>
</li>
<li>
<a href="01_index04_districtDetail.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">虹桥第五大道</div>
<div class="item-after"><em>¥61937元/㎡</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><i class="icon icon-address03"></i><small>上海市长宁区协和路1025号</small></div>
<div class="item-after"><span>距您260m</span></div>
</div>
<div class="item-subtitle">
<div>潜力指数: <span class="star"><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>近30天涨跌幅: <em class="down">0.56%<i class="icon icon-arrow-green"></i></em></div>
</div>
<div class="item-subtitle"><span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span></div>
</div>
</a>
</li>
<li>
<a href="01_index04_districtDetail.html" class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">协和小区</div>
<div class="item-after"><em>¥66737元/㎡</em></div>
</div>
<div class="item-title-row">
<div class="item-title"><i class="icon icon-address03"></i><small>上海市长宁区协和路699弄</small></div>
<div class="item-after"><span>距您268m</span></div>
</div>
<div class="item-subtitle">
<div>潜力指数: <span class="star"><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>近30天涨跌幅: <em class="down">0.56%<i class="icon icon-arrow-green"></i></em></div>
</div>
<div class="item-subtitle"><span class="tag"><small>近地铁</small><small>公交多</small><small>买菜做饭</small></span></div>
</div>
</a>
</li>
</ul>
</div>
</div>
<div id="tabList3" class="tab">
<div class="card cardInfo cardInfo01">
<div class="card-header">限购先售的时间,适合买房吗?</div>
<img src="../../images/cardInfoImg01.png">
<div class="card-footer">
<span><i class="icon icon-eye-orange"></i>2022人<i class="icon icon-comments-orange"></i>1245条</span>
</div>
<!-- 加载提示符 -->
<div id="loadTip2" class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
<div class="card cardInfo cardInfo02">
<div class="card-content">
<div class="list-block media-list">
<ul>
<li class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">经济适用房该如何出售</div>
</div>
<div class="item-subtitle"><font>市场上有不同种类的房源待售,经济适用房作为保障性住房的一种,政府对此非常重视。</font></div>
<div class="item-subtitle">
<span><i class="icon icon-eye-orange"></i>2022人<i class="icon icon-comments-orange"></i>1245条</span>
</div>
</div>
<div class="item-media">
<img src="../../images/cardInfoImg05.png">
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
<div id="tabList4" class="tab">
<div class="list-block media-list">
<ul class="list-container">
<li>
<a href="05_mine04_message02_detail.html" class="item-content message01 message01-new">
<div class="item-media"><i class="icon icon-message01"></i></div>
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">楼市降温这么明显,为什么降价的房子还是这么少?楼市降温这么明显,为什么降价的房子还是这么少?</div>
</div>
<div class="item-subtitle">2017-11-30 10:10</div>
</div>
</a>
</li>
<li>
<a href="05_mine04_message02_detail.html" class="item-content message01">
<div class="item-media"><i class="icon icon-message01"></i></div>
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">楼市降温这么明显,为什么降价的房子还是这么少?楼市降温这么明显,为什么降价的房子还是这么少?</div>
</div>
<div class="item-subtitle">2017-11-30 10:10</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
<#include "/customMenu.html" />
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
@@ -71,218 +308,32 @@
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
jQuery = $
Zepto = $
$.config = {router: false}
</script>
<script type='text/javascript' src='../../js/light7.js?version=${version!}' charset='utf-8'></script>
<script type="text/javascript" src="../../js/cn.js?version=${version!}" charset="utf-8"></script>
<script type="text/javascript" src="../../js/common.js?version=${version!}"></script>
<!--<script type="text/javascript" src="//g.alicdn.com/msui/sm/0.6.2/js/sm.min.js" charset="utf-8"></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 src="../../config.js"></script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<#include "/monitor/monitor.html">
<script type="text/javascript">
$("#ulTab1").empty();
$("#ulTab2").empty();
//$.init()
//加载flag
var loading = false;
//最多可加载的条目
var maxItems = 100;
//上次加载的序号小区
var lastIndex = 0;
//上次加载的序号城市
var lastIndex2 = 0;
//每次加载添加多少条目
var itemsPerLoad = 8;
var itemsPerLoadCity = 20;
var url = "loadCollections?pageSize="+itemsPerLoad;
var urlCity = "loadCityCollections?pageSize="+itemsPerLoadCity;
var curpage = 1;
var curpageCity = 1;
var totalCount = 0;
var tatalCountCity = 0;
function addEstate(number, lastIndex) {
curpage = lastIndex/itemsPerLoad + 1;
axios.get("/myCollection/loadCollections",{params:{pageSize:itemsPerLoad,page:curpage}}).then(function(response){
data = response.data;
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
$('#loadTip1').remove();
$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
return;
}
totalCount = data.totalCount;
// 生成新条目的HTML
var html = '';
$.each(data['results'], function(i){
var tag = this.tag;
var tagStr = "";
if(tag){
var tags = tag.split("_")
for(var j=0;j<tags.length;j++){
if(j<3){
var tag = tags[j];
tagStr = tagStr + '<small class="small01">'+tag+'</small>';
}
}
}
//'<div class="item-after"><em>'+(this.minPrice?this.minPrice:'')+'万-'+(this.maxPrice?this.maxPrice:'')+'万</em></div>'+
var priceStr = this.minPrice+'万-'+this.maxPrice+'万';
if(this.minPrice==null||this.minPrice==0||this.maxPrice==null||this.maxPrice==0){
priceStr="暂无数据";
}
html+= '<li>'+
'<a onclick="clicked(\'${basePath}/district/details?city='+this.city+'&region='+this.region+'&name='+this.name+'\',true)" class="item-link item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row">'+
'<div class="item-title">'+this.name+'</div>'+
'<div class="item-after">¥'+(this.avgPrice?this.avgPrice:'')+ '元/㎡</div>'+
'</div>'+
'<div class="item-title-row">'+
'<div class="item-title"><small>'+(this.address?(this.city+this.region+this.address):'')+'</small></div>'+
'</div>'+
'<div class="item-subtitle row">'+
'<div class="col-50">潜力指数: <em class="em01">68</em></div>'+
'<div class="col-50">涨跌幅: <em class="up">↑24.96%</em></div>'+
'<div class="col-100">租金回报率: <em class="em02">2.08%</em></div>'+
'</div>'+
'<div class="item-subtitle">'+tagStr+'</div>'+
'</div>'+
'</a>'+
'</li>';
});
// 添加新条目
$('#ulTab1').append(html);
if(totalCount<=itemsPerLoad){
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip1').remove();
}
}).catch(function(error){
console.log(error)
});
}
function addCity(number, lastIndex){
curpageCity = lastIndex2/itemsPerLoadCity + 1;
<script type="text/javascript" src="myFocus.js" charset="utf-8"></script>
<script>
axios.get("/myCollection/loadCityCollections",{params:{pageSize:itemsPerLoadCity,page:curpageCity}}).then(function(response){
data = response.data;
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
$('.infinite-scroll-bottom #tab2').html("<div class='noData'><img src='../../images/noData.png'><p>您还没有关注城市</p></div>");
return;
}
totalCountCity = data.totalCount;
// 生成新条目的HTML
var html = '';
$.each(data['results'], function(i){
avgPriceStr = '¥'+this.avgPrice+' 元/㎡';
if(this.avgPrice==null||this.avgPrice==0){
avgPriceStr="暂无数据";
}
html += '<li>'+
'<a href="../quotations/building?cityName='+this.city+'" class="item-link item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row">'+
'<div class="item-title">'+this.city+'</div>'+
'<div class="item-after">'+avgPriceStr+'</div>'+
'</div>'+
'</div>'+
'</a>'+
'</li>' ;
});
// 添加新条目
$('#ulTab2').append(html);
if(totalCountCity<=itemsPerLoadCity){
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
}
}).catch(function(error){
console.log(error)
});
}
//预先加载8条
addEstate(itemsPerLoad, 0);
addCity(itemsPerLoadCity, 0);
//$(document).on("pageInit", function() {
// $('.buttons-tab').fixedTab({offset:325});
// });
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
if($("#tab1").hasClass("active"))
{
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
// 更新最后加载的序号
lastIndex = $('#ulTab1').find('li').length;
if (lastIndex >= totalCount) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip1').remove();
return;
}
// 添加新条目
addEstate(itemsPerLoad, $('#ulTab1').find('li').length);
//容器发生改变,如果是js滚动,需要刷新滚动
// $.refreshScroller();
}, 1000);
}
if($("#tab2").hasClass("active"))
{
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
// 更新最后加载的序号
lastIndexCity = $('#ulTab2').find('li').length;
if (lastIndexCity >= totalCountCity) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
return;
}
// 添加新条目
addCity(itemsPerLoad, $('#ulTab2').find('li').length);
//容器发生改变,如果是js滚动,需要刷新滚动
// $.refreshScroller();
}, 1000);
}
});
</script>
</body>
</html>