From 17488fd1630c0cc223b7bdf86570f643a995f1c1 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 9 Apr 2018 19:07:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/user/myCollect.js | 50 +------------------------------ fangija-zsyf/js/user/myFocus.js | 11 ++----- fangija-zsyf/js/user/myHouse.js | 36 ---------------------- 3 files changed, 3 insertions(+), 94 deletions(-) diff --git a/fangija-zsyf/js/user/myCollect.js b/fangija-zsyf/js/user/myCollect.js index 613345e..8288307 100644 --- a/fangija-zsyf/js/user/myCollect.js +++ b/fangija-zsyf/js/user/myCollect.js @@ -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}); } /* 分页构造数据 */ diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js index e031456..542a83f 100644 --- a/fangija-zsyf/js/user/myFocus.js +++ b/fangija-zsyf/js/user/myFocus.js @@ -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+='' } } - html+= '
  • '+ ''+ '
    '+ @@ -87,9 +85,4 @@ function addEstate(number, lastIndex) { }).catch(function(error){ console.log(error) }); - console.log(1) -} - -//预先加载8条 -addEstate(mf_itemsPerLoad, 0); - +} \ No newline at end of file diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 9de6fcc..73d725b 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -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 = ''; From 0d54517b210b51198eabd92f5e63d03eaf046b88 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 9 Apr 2018 19:08:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=88=BF=E4=BA=A7js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 86473c3..7ecfbc2 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -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 } From c53585bf644b84bc9ce732984c389fa5153793e3 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 9 Apr 2018 19:09:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=94=B6=E8=97=8Fjs?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/news/newsCollectList.html | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/fangija-zsyf/views/news/newsCollectList.html b/fangija-zsyf/views/news/newsCollectList.html index 7cc503d..655c3a3 100644 --- a/fangija-zsyf/views/news/newsCollectList.html +++ b/fangija-zsyf/views/news/newsCollectList.html @@ -74,11 +74,8 @@ $.config = {router: false} From fbb27c0557a72f5f68e420e5818aa8cae9939a72 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 10 Apr 2018 09:23:22 +0800 Subject: [PATCH 5/5] aa --- fangija-zsyf/yfindex.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 50a04d6..64e986f 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -101,7 +101,7 @@ 我的房产
    -
    +
    智能选房
    @@ -2603,7 +2603,12 @@ function openNewsView(newId) { $("#visitCount_"+newId).text(count+'人'); } } - +function openIntelligentHouseView() { + mui.openWindow({ + url: 'views/intelligentHouse/index.html', + id:'index.html' + }); +}