From 79ad99fbb32e2718b6dff78b9dc2d361e036e695 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 11 May 2018 11:30:50 +0800 Subject: [PATCH 1/6] =?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 2/6] =?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 @@ -
  • - -
  • + +
  • From 999f681621a689b8a34857e53e4a2d95815a0d67 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Fri, 11 May 2018 15:03:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?YOUFANG1.0.4=20=E5=B7=A5=E5=85=B7=E6=9D=A1?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=20=E5=AE=8C=E5=85=A8=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/user/myCollect.js | 3 ++- fangija-zsyf/js/user/myFocus.js | 3 ++- fangija-zsyf/js/user/myHouse.js | 4 ++-- fangija-zsyf/js/user/myMessage.js | 3 ++- fangija-zsyf/views/user/userInfo.html | 10 +++++++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/fangija-zsyf/js/user/myCollect.js b/fangija-zsyf/js/user/myCollect.js index 8288307..56effac 100644 --- a/fangija-zsyf/js/user/myCollect.js +++ b/fangija-zsyf/js/user/myCollect.js @@ -50,7 +50,8 @@ function selectNewsCollectList(){ mc_pageSize = response.data.data.limit; mc_totalPages = response.data.data.totalPages; mc_totalRecords = response.data.data.totalRecords; - tab.mc_num = mc_totalRecords; +// tab.mc_num = mc_totalRecords; + $("#mc_num").html("收藏("+mc_totalRecords+")") mcAddItems(mc_itemsPerLoad, mc_lastIndex, dataObj); }).catch(function (error) { console.log(error); diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js index 7b4a31e..910426c 100644 --- a/fangija-zsyf/js/user/myFocus.js +++ b/fangija-zsyf/js/user/myFocus.js @@ -20,7 +20,8 @@ function addEstate(number, lastIndex) { return; } mf_totalCount = data.totalCount; - tab.mf_num = mf_totalCount; +// tab.mf_num = mf_totalCount; + $("#mf_num").html("关注("+mf_totalCount+")") // 生成新条目的HTML var html = ''; $.each(data['results'], function(i){ diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 5c2139b..9c73d1d 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -30,8 +30,8 @@ function selectHouseInfoList(){ var houseInfoTotalMap = resultsMap.houseInfoTotalMap; //调整统计num的顺序 mh_totalRecords = resultsMap.houseInfoPageList.totalRecords; - tab.mh_num = mh_totalRecords; - +// tab.mh_num = mh_totalRecords; + $("#mh_num").html("房产("+mh_totalRecords+")") if(resultList != null && resultList.length == 0){ // 删除加载提示符 $('#loadTip1').hide(); diff --git a/fangija-zsyf/js/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js index 7c1190f..d4ce568 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -23,7 +23,8 @@ function addMessage(loadNum,startNum){ return; } mm_totalCount = response.data.data.totalCount; - tab.mm_num = mm_totalCount; +// tab.mm_num = mm_totalCount; + $("#mm_num").html("消息("+mm_totalCount+")") var html=""; $.each(messageList,function(){ // var clickStr = ""; diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index bdfa472..de8f2af 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -120,9 +120,9 @@


    -
    +
    -
    +