From ebcf4bca2a7534cffb2776906dd688724b3da7a0 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sun, 8 Apr 2018 17:33:29 +0800 Subject: [PATCH] YOUFANG1.1 --- fangija-zsyf/config.js | 4 +- fangija-zsyf/js/user/myCollect.js | 258 +++++++++++++++++++ fangija-zsyf/js/user/myFocus.js | 34 ++- fangija-zsyf/views/news/newsCollectList.html | 2 +- fangija-zsyf/views/user/userInfo.html | 223 ++++++++-------- 5 files changed, 394 insertions(+), 127 deletions(-) create mode 100644 fangija-zsyf/js/user/myCollect.js diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index f20f0c4..4f3791c 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; +var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; -var BASE_PATH = "http://192.168.10.171:8084"; +//var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/user/myCollect.js b/fangija-zsyf/js/user/myCollect.js new file mode 100644 index 0000000..3c69504 --- /dev/null +++ b/fangija-zsyf/js/user/myCollect.js @@ -0,0 +1,258 @@ +var mc_uid = "162167854504869888"; +// 加载flag +var mc_loading = false; +//空置第一次显示 +var mc_yesterDayDeployFlag = true; + +//分页部分参数定义 +var mc_page; +var mc_pageSize; +var mc_totalPages; +var mc_totalRecords; +// 上次加载的序号 +var mc_lastIndex; +// 每次加载添加多少条目 +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 + } + }).then(function (response) { + var resultList = response.data.data.list; + if(resultList != null && resultList.length == 0){ + // 删除加载提示符 + $('#loadTip3').remove(); + // 加载完毕,则注销无限加载事件,以防不必要的加载 + //$.detachInfiniteScroll($('.infinite-scroll')); + return; + } + if(response.data.data.currentPage == response.data.data.totalPages){ + //如果此次查询刚好是page = totalPages + // 删除加载提示符 + $('#loadTip3').remove(); + // 加载完毕,则注销无限加载事件,以防不必要的加载 + //$.detachInfiniteScroll($('.infinite-scroll')); + } + //封装list数据 + var dataObj = []; + for(var i in resultList){ + dataObj.push(resultList[i]) + } + // 上次加载的序号 + mc_lastIndex = $('.cardInfo').length; + //每次加载添加多少条目 + mc_itemsPerLoad = resultList.length; + //请求后对page进行赋值 + mc_page = response.data.data.currentPage; + mc_pageSize = response.data.data.limit; + mc_totalPages = response.data.data.totalPages; + mc_totalRecords = response.data.data.totalRecords; + tab.mc_num = mc_totalRecords; + addItems(mc_itemsPerLoad, mc_lastIndex, dataObj); + }).catch(function (error) { + console.log(error); + }); +} + +//界面加载 +$(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+'人'); +} + +/* 分页构造数据 */ +function addItems(itemsPerLoad, lastIndex, dataObj) { + var html = ''; + for(var i in dataObj) { + /*if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag) { + yesterDayDeployFlag = false; + html += '
历史推荐
'; + }*/ + if(dataObj[i].type == "专题") { + html += '
' + + '
' + dataObj[i].title + '
' + + '' + + '' + + '
'; + } + if(dataObj[i].type == "推荐小区") { + html += '
' + + '
' + + '
  • ' + + '
    ' + + '
    ' + + '
    ' + dataObj[i].recommendDistrictName + '
    ' + + '
    ' + dataObj[i].recommendDistrictCity + '-' + dataObj[i].recommendDistrictRegion + + '
    '; + if(dataObj[i].recommendDistrictTags != "" && dataObj[i].recommendDistrictTags != null) { + var arry = dataObj[i].recommendDistrictTags.split("_"); + html += '
    '; + for(var j in arry) { + html += '' + arry[j] + ''; + } + html += '
    '; + } + html += '
    推荐指数:
    '; + if(dataObj[i].recommendDistrictPrice) { + html += '
    ' + dataObj[i].recommendDistrictPrice + '元/㎡
    '; + } + html += '
'; + } + if(dataObj[i].type == "活动") { + html += '
' + + '
' + dataObj[i].title + '
' + + '' + + '
'; + } + if(dataObj[i].type == "推荐城市") { + html += '
' + + '
推荐城市——' + dataObj[i].recommendCity + '
'; + if(dataObj[i].recommendCityTags != "" && dataObj[i].recommendCityTags != null) { + var arry = dataObj[i].recommendCityTags.split("_"); + html += '
'; + for(var j in arry) { + html += '' + arry[j] + ''; + } + html += '
'; + } + html += '' + + '
'; + } + if(dataObj[i].type == "新闻") { + html += '
' + + '
  • ' + + '
    ' + + dataObj[i].title + '
    ' + + '
    ' + dataObj[i].introduction + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
'; + } + if(dataObj[i].type == "投票") { + var voteFavorCount = dataObj[i].voteFavorCount; + var voteNoFavorCount = dataObj[i].voteNoFavorCount; + var voteFavorCountRate = 50 + var voteNoFavorCountRate = 50 + if(voteFavorCount == 0 && voteNoFavorCount == 0) { + + } else { + voteFavorCountRate = Math.round((voteFavorCount * 100) / (voteFavorCount + voteNoFavorCount)); + voteNoFavorCountRate = 100 - voteFavorCountRate; + } + + html += '
' + dataObj[i].title + + '
' + + '' + dataObj[i].voteFavorText + '' + + '
' + + '
' + dataObj[i].voteNoFavorText + '' + + '
V.S
'; + } + } + $('#myColect').append(html); +} \ No newline at end of file diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js index 4a3e9ed..ca70ede 100644 --- a/fangija-zsyf/js/user/myFocus.js +++ b/fangija-zsyf/js/user/myFocus.js @@ -1,7 +1,8 @@ var tab = new Vue({ el:"#tab", data:{ - mf_num:"0" + mf_num:"0", + mc_num:"0" } }) @@ -23,7 +24,7 @@ function addEstate(number, lastIndex) { data = response.data; //data = eval( '(' + data + ')' ); if(data['results']==null || data['results'].length==0) { - $('#loadTip1').remove(); + $('#loadTip2').remove(); $('.infinite-scroll-bottom #tab1').html("

您还没有关注小区

"); return; } @@ -89,7 +90,7 @@ function addEstate(number, lastIndex) { // 加载完毕,则注销无限加载事件,以防不必要的加载 // $.detachInfiniteScroll($('.infinite-scroll')); // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip2').remove(); } }).catch(function(error){ console.log(error) @@ -121,7 +122,7 @@ $(document).on('infinite', '.infinite-scroll',function() { // 加载完毕,则注销无限加载事件,以防不必要的加载 // $.detachInfiniteScroll($('.infinite-scroll')); // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip2').remove(); return; } // 添加新条目 @@ -130,4 +131,29 @@ $(document).on('infinite', '.infinite-scroll',function() { // $.refreshScroller(); }, 1000); } + if($("#tabList3").hasClass("active")) + { + // 如果正在加载,则退出 + 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); + } }); \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsCollectList.html b/fangija-zsyf/views/news/newsCollectList.html index 553feb1..7cc503d 100644 --- a/fangija-zsyf/views/news/newsCollectList.html +++ b/fangija-zsyf/views/news/newsCollectList.html @@ -42,7 +42,7 @@
-
    +
diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 9686e85..46704c9 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -28,8 +28,8 @@ .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;} - .tabs .tab{position:relative;} - .pstion{position:absolute;top:0;height:524px;} + .contentBox{position:relative;} + .pstion{position:absolute;top:0;height:572px;} @@ -75,133 +75,115 @@ -
- - -
-
-
-
    -
-
-
-
-
-
-
-
-
-
限购先售的时间,适合买房吗?
- - -
-
- @@ -228,7 +210,8 @@ $.config = {router: false} - + +