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

This commit is contained in:
2018-05-11 11:31:19 +08:00
8 changed files with 41 additions and 14 deletions
+6 -2
View File
@@ -5,7 +5,7 @@ var mf_maxItems = 100;
//上次加载的序号小区
var mf_lastIndex = 0;
//每次加载添加多少条目
var mf_itemsPerLoad = 8;
var mf_itemsPerLoad = 10;
var mf_curpage = 1;
var mf_totalCount = 0;
@@ -16,7 +16,7 @@ function addEstate(number, lastIndex) {
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
$('#loadTip2').remove();
$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
//$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
return;
}
mf_totalCount = data.totalCount;
@@ -80,6 +80,10 @@ function addEstate(number, lastIndex) {
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
}
if(data.results.length<mf_itemsPerLoad){
$('#loadTip2').remove();
return;
}
}).catch(function(error){
console.log(error)
+1 -1
View File
@@ -13,7 +13,7 @@
<link rel="stylesheet" href="css/light7-swiper.min.css" />
<link rel="stylesheet" type="text/css" href="css/mui.min.css"/>
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/theme-blue.css">
<link rel="stylesheet" href="css/theme-orange.css">
</head>
<body>
@@ -20,8 +20,6 @@
.list-block .buttons-row .button{width:72px;}
.topic .topicTitle{border-bottom:none;font-size:inherit;}
.topic .topicContent > p:first-child{margin-top:0;}
</style>
</head>
+2 -2
View File
@@ -38,7 +38,7 @@
</button>
<h1 class="title">置换方案建议</h1>
</header>
<div class="content contentSuggest infinite-scroll infinite-scroll-bottom" data-distance="50" id="resultDiv" v-cloak>
<div class="content contentSuggest" id="resultDiv" v-cloak>
<p>匹配出满足需求的<em>{{matchCount}}</em>个小区,智能推荐以下最合适的:</p>
<div class="selectContainer">
<div class="selectBox row">
@@ -92,7 +92,7 @@
</ul>
</div>
</div>
<div>
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
<div class="list-block media-list">
<ul class="list-container">
+5
View File
@@ -630,6 +630,11 @@ function openNewView(viewHtml) {
clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName})
}
function gotoLoanApply(){
var eventType = "loanClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){})
}
function gotoRentManager(){
+5
View File
@@ -279,6 +279,11 @@ function gotoHouseDetail(id){
//跳转房产申请贷款
function gotoLoanApply(houseId, city){
var eventType = "myHouseLoanClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: ""},function(){})
}
+11 -7
View File
@@ -27,13 +27,9 @@
.topic .topicContent .topicContent_center.home div .icon{width:42px;height:42px;}
.topic .topicContent .topicContent_center.home div span{font-size:0.7rem;color:#666;}
.contentBox{position:relative;}
.pstion{position:absolute;top:0;height:600px;}
.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;}
@media(min-height:750px){
.pstion{height:700px;}
}
</style>
</head>
@@ -118,7 +114,7 @@
<span class="icon icon-set"></span>
</button>
</header>
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="topBg01">
<!-- 目前是登录后点击个人头像设置密码 -->
<img src="../../images/headPortrait.png" id="user_headImg" onclick="gotoUpdatePass()">
@@ -282,6 +278,8 @@ function checkIsLogin(){
selectNewsCollectList();
//加载消息列表
addMessage(mm_itemsPerLoad,0);
//加载工具条
loadToolList();
}
}
@@ -307,6 +305,11 @@ function gotoUpdatePass(){
//跳转房产申请贷款
function gotoLoanApply(houseId, city){
var eventType = "userInfo_MyHouseLoanClick";
var dataMap = {};
dataMap["hid"]=houseId;
saveBehaviorLog(eventType,dataMap); //保存用户点击事件
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){})
}
@@ -501,6 +504,9 @@ function openSettingPage() {
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
checkIsLogin();
}
function loadToolList (){
var toolList = new Vue({
el:"#toolList",
data:{
@@ -551,9 +557,7 @@ function onPlusReady(){
}).catch(function(error){
console.log(error);
});
checkIsLogin();
}
$("a[href='#tabList1'],a[href='#tabList2'],a[href='#tabList3']").click(function(){
var eventType = "";
var type = $(this).text();
+11
View File
@@ -6,8 +6,10 @@
<meta name="HandheldFriendly" content="true"/>
<meta name="MobileOptimized" content="320"/>
<title></title>
<script type="text/javascript" src="../js/mui.min.js"></script>
<script type="text/javascript" src="../js/common.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
var ws=null,embed=null;
// 扩展API加载完毕,现在可以正常调用扩展API
function plusReady(){
@@ -95,4 +97,13 @@
</header>
</body>
<script type="text/javascript" src="../js/immersed.js" ></script>
<script>
mui.plusReady(function() {
//按下Android返回键盘的逻辑处理
mui.back = function(){
back();
};
});
</script>
</html>