From 130a45f501cef10dd6e00db76b8b28ea5a27b471 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 12 Apr 2018 11:38:28 +0800 Subject: [PATCH 01/17] aa --- fangija-zsyf/views/intelligentHouse/mapDetail.html | 1 - fangija-zsyf/yfindex.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fangija-zsyf/views/intelligentHouse/mapDetail.html b/fangija-zsyf/views/intelligentHouse/mapDetail.html index a9ce17b..526c535 100644 --- a/fangija-zsyf/views/intelligentHouse/mapDetail.html +++ b/fangija-zsyf/views/intelligentHouse/mapDetail.html @@ -207,7 +207,6 @@ function onPlusReady(){ this.mapObj = new BMap.Map("map", {minZoom:this.datas.minZoom,maxZoom:this.datas.maxZoom}) } this.mapObj.enableScrollWheelZoom(); - alert(this.datas.center.lat); this.mapObj.centerAndZoom(this.datas.center, this.datas.zoom); var that = this; diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ad60cd9..a2a4444 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1504,7 +1504,7 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric textStr = textName.substr(0,5)+ "..."; } - html += '
'+ + html += '
'+ textStr+ '
'+response.data.data.dtos[i].avgPrice+'元/㎡
'; From 9f316bca49b07b1bcd3079c727a000a7bbb3a525 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Thu, 12 Apr 2018 11:52:17 +0800 Subject: [PATCH 02/17] =?UTF-8?q?YOUFANG=20=E6=88=BF=E4=BA=A7=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/component/myFocusComponent.js | 1 - fangija-zsyf/views/house/houseDetail.html | 32 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index 551a754..5edb81d 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -63,5 +63,4 @@ Vue.component('my_focus',{ },mounted:function(){ this.loadMyFocus(); } - }) \ No newline at end of file diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index d51269d..0db645b 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -485,19 +485,6 @@ $.config = {router: false} - - + + + + diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index f66dc9a..f4ec35d 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -41,7 +41,7 @@ - @@ -110,7 +110,7 @@ - @@ -401,6 +401,11 @@ function selectUserInfo(){ }); } +function openSettingPage() { + clicked('../setting/setting.html',true,false,{},{},function(){ + checkIsLogin(); + }) +} $(document).ready(function () { checkIsLogin(); }); From 41a8bcc2a94aa68c835d1c4a118b57513148e4f1 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 12 Apr 2018 12:44:24 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E8=81=94=E8=B0=83=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/user/userInfo.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index f66dc9a..7860290 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -275,6 +275,9 @@ function checkIsLogin(){ $('#page-group-login').hide(); $('#page-group-nologin').show(); }else{ + //控制显示 + $('#page-group-nologin').hide(); + $('#page-group-login').show(); //加载个人信息 selectUserInfo(); //加载我的关注 @@ -283,9 +286,6 @@ function checkIsLogin(){ selectHouseInfoList(); //加载我的收藏 selectNewsCollectList(); - //控制显示 - $('#page-group-nologin').hide(); - $('#page-group-login').show(); } } @@ -301,11 +301,17 @@ function gotoUpdatePass(){ clicked('/views/user/updatePass.html',true,false,{},{},function(){}) } -//调整房产申请贷款 +//跳转房产申请贷款 function gotoLoanApply(houseId, city){ clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){}) } +//跳转房产详情 +function gotoHouseDetail(id){ + clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){ + }) +} + //注册'infinite'事件处理函数 $(document).on('infinite', '.infinite-scroll',function() { if($("#tabList1").hasClass("active")){ From e9f889d3aa638583dbcd2ca52873f2434815a428 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 12 Apr 2018 12:45:31 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/user/myHouse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 914dfc1..8f5f0bf 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -79,7 +79,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2); tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); } - html += "
  • "; + html += '
  • '; html += "
    "; html += "
    "+result.name+" "+tempTotalPrice+"万"+result.liveStatus+"
    "; html += "
    "; From 8548dd7f74c6a888274bdca1233d4f0c2690f9af Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 12 Apr 2018 12:45:48 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 43 ++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index da795e6..9c7ab5c 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -93,6 +93,30 @@
    +
    + + - \ No newline at end of file From 3cbfd87acd437190869cbf052061c72d9d8c15b7 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 12 Apr 2018 15:00:25 +0800 Subject: [PATCH 13/17] aa --- fangija-zsyf/views/house/detail.html | 30 +++++++++----- fangija-zsyf/views/house/houseManageList.html | 41 +++++++++++-------- 2 files changed, 45 insertions(+), 26 deletions(-) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 16db67f..c3780b7 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -3,7 +3,7 @@ - +房产分析 @@ -83,19 +83,19 @@
    -
    + +
    出租管理
    -
    + +
    我要贷款
    @@ -296,6 +296,9 @@ var lng; var city; var region; var name; +var oriCity; +var oriRegion; +var oriName; //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ var self = plus.webview.currentWebview(); @@ -344,9 +347,9 @@ function init(){ var houseInfo = response.data.data.houseInfo; lat = houseInfo.lat; lng = houseInfo.lng; - city = houseInfo.city; - region = houseInfo.region; - name = houseInfo.name; + oriCity = houseInfo.city; + oriRegion = houseInfo.region; + oriName = houseInfo.name; address = houseInfo.address; var text = houseInfo.name; var length = text.length; @@ -359,6 +362,9 @@ function init(){ if(response.data.data.rentRooms){ rentRooms = response.data.data.rentRooms; } + city = houseInfo.city; + region = houseInfo.region; + name = houseInfo.name; baseInfo.id=houseInfo.id; baseInfo.city = houseInfo.city; baseInfo.name = houseInfo.name; @@ -497,6 +503,10 @@ $("#tabRentDiv").on("click", function () { $("#tabChart2").css("z-index","1"); $("#tabChart1").css("z-index","-1"); }); +function openNewView(viewHtml) { + alert(viewHtml) + clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName}) +} diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 959d1eb..8345eca 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -25,8 +25,14 @@ .list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;} .list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;} /**添加loading加载效果**/ - .loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;} - .loadingBg .infinite-scroll-preloader{margin-top:60%;} + .loadingBgDiv{width:100%;height:70%;background:#fff;overflow:hidden;position:absolute;top:2.2rem;left:0;z-index:100;} + .loadingBgDiv .infinite-scroll-preloader{margin-top:60%;} + .list-block{margin-bottom:4rem;} + .content-block{width:100%;background:#fff;position:fixed;bottom:0;z-index:10000;} + @media(min-height:750px){ + .list-block{margin-bottom:4.5rem;} + .content-block{bottom:4.5rem;} + } @@ -36,17 +42,13 @@