From ec9639dd23e21024ccaeb0faad296dcb359633e9 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 11 May 2018 11:16:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B4=B7=E6=AC=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/detail.html | 5 +++++ fangija-zsyf/views/house/houseList.html | 5 +++++ fangija-zsyf/views/user/userInfo.html | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 3a0cf90..ceb5bf7 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -630,6 +630,11 @@ function openNewView(viewHtml) { clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName}) } function gotoLoanApply(){ + var eventType = "loanClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){}) } function gotoRentManager(){ diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 7050d75..52e4666 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -279,6 +279,11 @@ function gotoHouseDetail(id){ //跳转房产申请贷款 function gotoLoanApply(houseId, city){ + var eventType = "myHouseLoanClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: ""},function(){}) } diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index bdfa472..a324973 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -305,6 +305,11 @@ function gotoUpdatePass(){ //跳转房产申请贷款 function gotoLoanApply(houseId, city){ + var eventType = "userInfo_MyHouseLoanClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){}) } From 79ad99fbb32e2718b6dff78b9dc2d361e036e695 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 11 May 2018 11:30:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/counter/loan_calculat.js | 105 ------- fangija-zsyf/views/taxes/taxes.html | 352 ----------------------- 2 files changed, 457 deletions(-) delete mode 100644 fangija-zsyf/js/counter/loan_calculat.js delete mode 100644 fangija-zsyf/views/taxes/taxes.html diff --git a/fangija-zsyf/js/counter/loan_calculat.js b/fangija-zsyf/js/counter/loan_calculat.js deleted file mode 100644 index 68f741f..0000000 --- a/fangija-zsyf/js/counter/loan_calculat.js +++ /dev/null @@ -1,105 +0,0 @@ -function loanCalculat(){ - - var loanPrice = $("input[name=loanPrice]").val(); - if(loanPrice=="" || loanPrice=="0"){ - $("#price_error").show(); - return false; - }else{ - $("#price_error").hide(); - } - - var rate = $("input[name=rate]").val(); - if(rate=="" || rate=="0"){ - $("#rate_error").show(); - return false; - }else{ - $("#rate_error").hide(); - } - - var repaymentWay = $("select[name=repaymentWay]").val();//贷款方式 - var amount = parseFloat(loanPrice);//贷款金额 - var month = parseInt($("select[name=loanMonth]").val());//贷款年限 - rate = parseFloat(rate);//年利率 - - - if(repaymentWay == "1"){ - var payMonth = getPayMonth1(amount, month, rate); - var totalInterest = getTotalInterest1(payMonth, month, amount); - $("#payMonth").html(payMonth.toFixed(3)+""); - $("#interest").html(totalInterest.toFixed(2)+""); - $("#payTotalPrice").html((totalInterest+amount*10000).toFixed(2)+""); - }else if(repaymentWay == "2"){ - var firstMonthPay = getPayMonth2(amount, month, rate); - - var totalInterest = getTotalInterest2(amount, month, rate); - var lessPrice = getLessMonth(amount, month, rate); - - $("#interest").html(totalInterest.toFixed(2)+""); - $("#payTotalPrice").html((totalInterest+amount*10000).toFixed(2)+""); - - var s = ""; - for(var i=1;i<=month;i++){ - if(i!=1){ - firstMonthPay = firstMonthPay - lessPrice; - } - s = s + "

"+i+"期,"+firstMonthPay.toFixed(2)+"元

" - } - $("#payMonth").html(s); - } -} - -//每月还款额(等额本息还款法) -function getPayMonth1(amount, month, rate) { - var monthRate = rate / 1200; - var b = Math.pow(1 + monthRate, month) - 1; - return amount * 10000 * monthRate * Math.pow(1 + monthRate, month) / b; -} - -/** - * (等额本息还款法) - * 总利息=每月还款额*还款月数-贷款额 - * payMonth:月供(元) - * month:贷款月数 - * amount:贷款金额(万元) - */ -function getTotalInterest1(payMonth, month, amount) { - return payMonth * month - amount * 10000; -} - - - -/** - * (等额本金还款法) - * 首月还款额=贷款额/还款月数+贷款额*月利率 - * amount:贷款金额(万元) - * month:贷款月数 - * rate:年利率 - */ -function getPayMonth2(amount, month, rate) { - var monthRate = rate / 1200; - return amount * 10000 / month + amount * 10000 * monthRate; -} - -/** - * (等额本金还款法) - * 总利息=贷款额*月利率*(还款月数+1)/2 - * amount:贷款金额(万元) - * month:贷款月数 - * rate:年利率 - */ -function getTotalInterest2(amount, month, rate) { - var monthRate = rate / 1200; - return amount * 10000 * monthRate * (month + 1) / 2; -} - -/** - * (等额本金还款法) - * 还款每月递减额=贷款额/还款月数*月利率 - * amount:贷款金额(万元) - * month:贷款月数 - * rate:年利率 - */ -function getLessMonth(amount, month, rate) { - var monthRate = rate / 1200; - return amount * 10000 / month * monthRate; -} \ No newline at end of file diff --git a/fangija-zsyf/views/taxes/taxes.html b/fangija-zsyf/views/taxes/taxes.html deleted file mode 100644 index 5153dc4..0000000 --- a/fangija-zsyf/views/taxes/taxes.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - -税费计算 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From b905310ecc0b04d3a6b4a4dbc0ede7894977fd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Fri, 11 May 2018 14:25:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8D=E7=99=BB=E5=BD=95=E4=B9=9F?= =?UTF-8?q?=E8=83=BD=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/setting/setting.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index cc66b54..a8bf21a 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -38,15 +38,13 @@ -
  • - -
  • + +