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

Conflicts:
	fangija-zsyf/yfindex.html
This commit is contained in:
2018-04-10 09:38:45 +08:00
7 changed files with 120 additions and 132 deletions
+1 -49
View File
@@ -1,4 +1,3 @@
var mc_uid = "162167854504869888";
// 加载flag
var mc_loading = false;
//分页部分参数定义
@@ -13,41 +12,11 @@ var mc_itemsPerLoad;
// 最多可加载的条目
var mc_maxItems = 100;
//初始化init
$.init();
// 注册'infinite'事件处理函数
//$(document).on('infinite', '.infinite-scroll-bottom', function() {
// // 如果正在加载,则退出
// if(mc_loading) return;
// // 设置flag
// mc_loading = true;
// // 模拟1s的加载过程
// setTimeout(function() {
// // 重置加载flag
// mc_loading = false;
// //如果当前页大于等于总页数
// if(mc_page >= mc_totalPages) {
//// // 加载完毕,则注销无限加载事件,以防不必要的加载
//// $.detachInfiniteScroll($('.infinite-scroll'));
// // 删除加载提示符
// $('#loadTip3').remove();
// return;
// }
// //控制查询下一页的数据
// mc_page = mc_page + 1;
// selectNewsCollectList();
// //容器发生改变,如果是js滚动,需要刷新滚动
// //$.refreshScroller();
// }, 1000);
//});
//我的收藏查询请求
function selectNewsCollectList(){
axios.get(BASE_PATH + "/rest/news/collectList",
{
params: {
uid: mc_uid,
page: mc_page,
pageSize: mc_pageSize
}
@@ -88,29 +57,12 @@ function selectNewsCollectList(){
});
}
//界面加载
$(document).ready(function () {
selectNewsCollectList();
});
function openUrl(url){
clicked(url, true);
}
function openNewsView(newId) {
clicked('/fangija-zsyf/views/news/newsDetail.html',true,false,{},{newsId:newId},function(newId){
axios.post(BASE_PATH + "/rest/comment/getCommentCount",{commentObjId : newId}).then(function (response) {
var msg = response.data.message
if(response.data.status){
$("#visitComment_"+newId).text(response.data.data+"条");
}
})
.catch(function (error) {
console.log(error);
});
},newId);
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
$("#visitCount_"+newId).text(count+'人');
clicked('/views/news/newsDetail.html', true, false, {}, {newsId:newId});
}
/* 分页构造数据 */
+2 -9
View File
@@ -1,5 +1,3 @@
$("#mf_ul").empty();
$.init()
//加载flag
var mf_loading = false;
//最多可加载的条目
@@ -10,6 +8,7 @@ var mf_lastIndex = 0;
var mf_itemsPerLoad = 8;
var mf_curpage = 1;
var mf_totalCount = 0;
function addEstate(number, lastIndex) {
mf_curpage = mf_lastIndex/mf_itemsPerLoad + 1;
axios.get("/rest/myCollection/loadCollections",{params:{pageSize:mf_itemsPerLoad,page:mf_curpage}}).then(function(response){
@@ -55,7 +54,6 @@ function addEstate(number, lastIndex) {
starStr+='<i class="icon icon-star"></i>'
}
}
html+= '<li>'+
'<a onclick="clicked(\'${basePath}/district/details?city='+this.city+'&region='+this.region+'&name='+this.name+'\',true)" class="item-content">'+
'<div class="item-inner">'+
@@ -87,9 +85,4 @@ function addEstate(number, lastIndex) {
}).catch(function(error){
console.log(error)
});
console.log(1)
}
//预先加载8条
addEstate(mf_itemsPerLoad, 0);
}
-36
View File
@@ -1,4 +1,3 @@
var mh_uid = "162167854504869888";
// 加载flag
var mh_loading = false;
@@ -15,41 +14,11 @@ var mh_itemsPerLoad;
// 最多可加载的条目
var mh_maxItems = 100;
//初始化init
$.init();
// 注册'infinite'事件处理函数
/*$(document).on('infinite', '.infinite-scroll-bottom', function() {
// 如果正在加载,则退出
if(loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
//如果当前页大于等于总页数
if(page >= totalPages) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').remove();
return;
}
//控制查询下一页的数据
page = page + 1;
selectHouseInfoList();
//容器发生改变,如果是js滚动,需要刷新滚动
//$.refreshScroller();
}, 1000);
});*/
//我的收藏查询请求
function selectHouseInfoList(){
axios.get(BASE_PATH + "/rest/index/ourHouseInfoList",
{
params: {
uid: mh_uid,
page: mh_page,
pageSize: mh_pageSize
}
@@ -96,11 +65,6 @@ function selectHouseInfoList(){
});
}
//界面加载
$(document).ready(function () {
selectHouseInfoList();
});
/* 分页构造数据 */
function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap) {
var html = '';
-2
View File
@@ -107,7 +107,6 @@ var baseInfo = new Vue({
}
})
var uid = "162167854504869888";
// 加载flag
var loading = false;
@@ -155,7 +154,6 @@ function selectHouseInfoList(){
axios.get(BASE_PATH + "/rest/index/ourHouseInfoList",
{
params: {
uid: uid,
page: page,
pageSize: pageSize
}
+1 -21
View File
@@ -74,11 +74,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script>
var uid = "162167854504869888";
// 加载flag
var loading = false;
//空置第一次显示
var yesterDayDeployFlag = true;
//分页部分参数定义
var page;
@@ -126,7 +123,6 @@ function selectNewsCollectList(){
axios.get(BASE_PATH + "/rest/news/collectList",
{
params: {
uid: uid,
page: page,
pageSize: pageSize
}
@@ -175,29 +171,13 @@ function openUrl(url){
}
function openNewsView(newId) {
clicked('/fangija-zsyf/views/news/newsDetail.html',true,false,{},{newsId:newId},function(newId){
axios.post(BASE_PATH + "/rest/comment/getCommentCount",{commentObjId : newId}).then(function (response) {
var msg = response.data.message
if(response.data.status){
$("#visitComment_"+newId).text(response.data.data+"条");
}
})
.catch(function (error) {
console.log(error);
});
},newId);
var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1;
$("#visitCount_"+newId).text(count+'人');
clicked('/views/news/newsDetail.html', true, false, {}, {newsId:newId});
}
/* 分页构造数据 */
function addItems(itemsPerLoad, lastIndex, dataObj) {
var html = '';
for(var i in dataObj) {
/*if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag) {
yesterDayDeployFlag = false;
html += '<div class="content-block-title recommend" style="border-top:solid 0.5rem #f3f3f3;">历史推荐</div>';
}*/
if(dataObj[i].type == "专题") {
html += '<div class="card cardInfo cardInfo01" onclick="openNewsView(\'' + dataObj[i].id + '\')">' +
'<div class="card-header">' + dataObj[i].title + '</div>' +
+106 -9
View File
@@ -18,7 +18,7 @@
.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;}
.page > header.bar{position:static;padding-left:0.75rem;padding-right:0.75rem;background:#fff;}
.page > header.bar{position:static;padding-left:0.75rem;padding-right:0.75rem;background:#fff;border-bottom:none;}
.page > header.barBorder{border-bottom:solid 0px #e7e7e7;}
.page > header.bar.theme{background:#F18D00;}
.bar-nav.theme .icon.icon-left{color:#fff;}
@@ -35,10 +35,79 @@
<body>
<div class="page-group">
<div class="page-group" style="display: none;" id="page-group-nologin">
<div class="page page-current">
<header class="bar bar-nav theme">
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked(BASE_PATH+'/user/setting', true)">
<span class="icon icon-set"></span>
</button>
</header>
<div class="content">
<div class="topBg01">
<img src="../../images/headPortrait.png">
<p><a class="button theme" href="#" onclick="gotoLogin()" >立即登录</a></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>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='#'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44">
<a href="#" class="tab-link button active">房产(0)</a>
<a href="#" class="tab-link button">关注(0)</a>
<a href="#" class="tab-link button">收藏(0)</a>
<a href="#" class="tab-link button">消息(0)</a>
</div>
<div class="tabs">
<div id="" class="tab active">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="page-group" style="display: none;" id="page-group-login">
<div class="page page-current">
<header class="bar bar-nav theme barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked(BASE_PATH+'/user/setting',true)">
@@ -184,6 +253,9 @@ $(".cardInfo01,.cardInfo02").on("click", function(){
window.location.href = "#";
});
//初始化init
$.init();
var tab = new Vue({
el:"#tab",
data:{
@@ -193,10 +265,33 @@ var tab = new Vue({
}
})
//判断是否登录
function checkIsLogin(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
$('#page-group-login').hide();
$('#page-group-nologin').show();
}else{
//加载我的关注
addEstate(mf_itemsPerLoad, 0);
//加载我的房产
selectHouseInfoList();
//加载我的收藏
selectNewsCollectList();
//控制显示
$('#page-group-nologin').hide();
$('#page-group-login').show();
}
}
function gotoLogin(){
clicked('/views/user/passLogin.html',true,false,{},{},function(){
checkIsLogin();
})
}
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll',function() {
if($("#tabList1").hasClass("active"))
{
if($("#tabList1").hasClass("active")){
// 如果正在加载,则退出
if(mh_loading) return;
// 设置flag
@@ -220,8 +315,7 @@ $(document).on('infinite', '.infinite-scroll',function() {
//$.refreshScroller();
}, 1000);
}
if($("#tabList2").hasClass("active"))
{
if($("#tabList2").hasClass("active")){
// 如果正在加载,则退出
if (mf_loading) return;
// 设置flag
@@ -245,8 +339,7 @@ $(document).on('infinite', '.infinite-scroll',function() {
// $.refreshScroller();
}, 1000);
}
if($("#tabList3").hasClass("active"))
{
if($("#tabList3").hasClass("active")){
// 如果正在加载,则退出
if(mc_loading) return;
// 设置flag
@@ -272,6 +365,10 @@ $(document).on('infinite', '.infinite-scroll',function() {
}
});
$(document).ready(function () {
checkIsLogin();
});
</script>
</body>
+10 -6
View File
@@ -101,7 +101,7 @@
<i class="icon icon-home01"></i>
<span>我的房产</span>
</div>
<div onclick="openUrl(BASE_PATH+'/intelligentHouse/index',true)">
<div @click="openIntelligentHouseView()">
<i class="icon icon-home02"></i>
<span>智能选房</span>
</div>
@@ -1173,7 +1173,7 @@
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
var cat = ""
</script>
<script type="text/javascript" src="js/vue.js"></script>
<script type="text/javascript" src="js/light7-2.js" charset="utf-8"></script>
@@ -1213,7 +1213,6 @@ var lat = 0;
var lng = 0;
var address = "";
var timestamp1 = new Date().getTime();
document.addEventListener('plusready', onPlusReady, false);
//扩展API加载完毕,现在可以正常调用扩展API
function onPlusReady(){
@@ -1504,8 +1503,8 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric
textStr = textName.substr(0,5)+ "...";
}
html += '<div class="card cardNearby" onclick="openDistWindow('+response.data.data.dtos[i].city+','+response.data.data.dtos[i].district+','+response.data.data.dtos[i].name+')"><div class="card-header">'+
textStr+
html += '<div class="card cardNearby" onclick="openDistWindow('+response.data.data.dtos[i].city+','+response.data.data.dtos[i].district+','+response.data.data.dtos[i].name+')"><div class="card-header">'+
textStr+
'</div><div class="card-content"><div class="card-content-inner">'+response.data.data.dtos[i].avgPrice+'元/㎡</div></div><div class="card-footer">'+
'距您'+response.data.data.dtos[i].distance+'m</div></div>';
}
@@ -2604,7 +2603,12 @@ function openNewsView(newId) {
$("#visitCount_"+newId).text(count+'人');
}
}
function openIntelligentHouseView() {
mui.openWindow({
url: 'views/intelligentHouse/index.html',
id:'index.html'
});
}
function openDistWindow(city, region, name){
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});