From 9f316bca49b07b1bcd3079c727a000a7bbb3a525 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Thu, 12 Apr 2018 11:52:17 +0800 Subject: [PATCH 1/7] =?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 5/7] =?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 6/7] =?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 7/7] =?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 @@
    +
    + +