diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index ce2d4c9..b67f403 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,11 +1,11 @@ /**服务端地址**/ -var BASE_PATH = "http://youfang.fangjia.com"; +//var BASE_PATH = "http://youfang.fangjia.com"; //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.47:8086"; //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.53:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 9bccd0c..dede11d 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -884,6 +884,7 @@ input::-webkit-input-placeholder{ .buttons-row01 .button{border-radius:0.1rem;margin-left:0.5rem;padding:0;font-size:0.65rem;} .buttons-row01 .button:first-child,.buttons-row01 .button:last-child{border-radius:0.1rem;} .buttons-row01a .button{width:22%;} +.buttonBox .button{border-radius:0.15rem;border-color:#D7D7D7;font-size:0.65rem;color:#333;margin-bottom:0.5rem;padding:0;} .topic .topicTitle > div.content-block.content-block01{position:relative;float:none;} .content-block01 .buttons-row.theme{width:100%;border-bottom:solid 1px #e7e7e7;} diff --git a/fangija-zsyf/css/theme-orange.css b/fangija-zsyf/css/theme-orange.css index d9a8b4d..c8ca97c 100644 --- a/fangija-zsyf/css/theme-orange.css +++ b/fangija-zsyf/css/theme-orange.css @@ -245,6 +245,8 @@ html:not(.watch-active-state) .theme label.label-radio:active, .buttons-row.theme .button{border-color:#D7D7D7;color:#999;} .buttons-row.theme .button.active{background:none;border-color:#F18D00;color:#F18D00;} .buttons-row01.theme .button{color:#333;} +.buttonBox .button.active{background:none;border-color:#F18D00;color:#F18D00;} +.buttonBox .button:active{background:none;border-color:#F18D00;color:#F18D00;} .selectBox div.theme{background:none;} .selectBox div.theme.active{color:#F18D00;} diff --git a/fangija-zsyf/images/addHouse.png b/fangija-zsyf/images/addHouse.png index ffb1e30..a4ad493 100644 Binary files a/fangija-zsyf/images/addHouse.png and b/fangija-zsyf/images/addHouse.png differ diff --git a/fangija-zsyf/js/counter/loan_calculat.js b/fangija-zsyf/js/counter/loan_calculat.js new file mode 100644 index 0000000..68f741f --- /dev/null +++ b/fangija-zsyf/js/counter/loan_calculat.js @@ -0,0 +1,105 @@ +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/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index dab296b..4c49a13 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -560,6 +560,7 @@ function loadRentTrends(city, region, name, type){ var m = re.times; var pm = re.distMap var rooms = re.rooms; + var estateType = re.estateType if(m && rooms.length>0){ @@ -568,6 +569,16 @@ function loadRentTrends(city, region, name, type){ } for(var k in rooms){ var room = rooms[k] + if(estateType && estateType.indexOf("别墅")>-1){ + if(room > 8){ + continue; + } + }else{ + if(room > 5){ + continue; + } + } + var distM = pm[room]; var distObj = new Object(); var distDatas = new Array(); diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html new file mode 100644 index 0000000..159f72f --- /dev/null +++ b/fangija-zsyf/views/changeHouse/index.html @@ -0,0 +1,686 @@ + + + + + +我要置换 + + + + + + + + + + + + + + + + +
+
+
+ +

我要置换

+
+ + +
+
+ +
+
+
意向区域(最多可选3个) + +
+
+ +
+
+ +
+
意向面积90-110㎡
+
+
+
+ +
+ 507090110150200300 +
+
+
+
选房标签(最多可选3个)
+ +
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/changeHouse/result.html b/fangija-zsyf/views/changeHouse/result.html new file mode 100644 index 0000000..b03f2d1 --- /dev/null +++ b/fangija-zsyf/views/changeHouse/result.html @@ -0,0 +1,797 @@ + + + + + +房产置换 + + + + + + + + + + + + + + + + +
+
+
+ + +

我要置换

+
+ + + +
+ +
+ + +
+
+ +
+
+ + + +
+ +
+
+ + + + +
+
意向面积90-110㎡
+
+
+
+ + +
+ 507090110150200300 +
+
+
+ +
选房标签(最多可选3个)
+ +
+ +
+ +
+
+
+
+

Open Preloader

+
+ <#include "/customMenu.html" /> +
+ +<#include "/city.html"/> + + + + + +<#include "searchDistrict.html"/> + + + + + + + + + + + +<#include "/monitor/monitor.html"> + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/taxes/taxes.html b/fangija-zsyf/views/taxes/taxes.html new file mode 100644 index 0000000..5153dc4 --- /dev/null +++ b/fangija-zsyf/views/taxes/taxes.html @@ -0,0 +1,352 @@ + + + + + +税费计算 + + + + + + + + + + + + + + + + +
+
+
+ +

税费计算

+
+ +
+
+ + + + + + + + + + + + + + + + + + + \ No newline at end of file