Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4

This commit is contained in:
xuhe@fangjia.com
2018-05-14 13:41:27 +08:00
9 changed files with 36 additions and 488 deletions
-1
View File
@@ -547,7 +547,6 @@ input::-webkit-input-placeholder{
.content-padded{margin:0.75rem;}
.content-padded h1{font-size:1.1rem;line-height:1.6rem;letter-spacing:0.11rem;}
.content-padded p{font-size:0.8rem;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;}
.content-padded p span{margin-left:1rem;}
.content-padded p small{font-size:0.65rem;color:#999;line-height:0.9rem;letter-spacing:0.07rem;float:left;}
.content-padded img{width:100%;}
-105
View File
@@ -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)+"<label>元</label>");
$("#interest").html(totalInterest.toFixed(2)+"<label>元</label>");
$("#payTotalPrice").html((totalInterest+amount*10000).toFixed(2)+"<label>元</label>");
}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)+"<label>元</label>");
$("#payTotalPrice").html((totalInterest+amount*10000).toFixed(2)+"<label>元</label>");
var s = "";
for(var i=1;i<=month;i++){
if(i!=1){
firstMonthPay = firstMonthPay - lessPrice;
}
s = s + "<p>"+i+"期,"+firstMonthPay.toFixed(2)+"元</p>"
}
$("#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;
}
+2 -1
View File
@@ -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);
+2 -1
View File
@@ -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){
+2 -2
View File
@@ -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();
+3 -1
View File
@@ -23,7 +23,9 @@ function addMessage(loadNum,startNum){
return;
}
mm_totalCount = response.data.data.totalCount;
tab.mm_num = mm_totalCount;
var unReadNum = response.data.data.unReadNum;
// tab.mm_num = mm_totalCount;
$("#mm_num").html("消息("+unReadNum+")")
var html="";
$.each(messageList,function(){
// var clickStr = "";
+6 -8
View File
@@ -38,15 +38,13 @@
</div>
</a>
</li>
<li v-show="feedBack">
<a onclick="clicked('/views/user/feedBack.html',true);" class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">意见反馈</div>
</div>
<a onclick="clicked('/views/user/feedBack.html',true);" class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">意见反馈</div>
</div>
</a>
</li>
</div>
</a>
<li>
<a onclick="clicked('about.html',true);" class="item-link item-content">
<div class="item-inner">
-352
View File
@@ -1,352 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>税费计算</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/city.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
.buttons-tab:after{height:0;}
.textAlignLeft{left:116px;}
</style>
</head>
<body>
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<h1 class="title">税费计算</h1>
</header>
<div class="content">
<div class="content-block">
<div class="buttons-tab theme">
<a href="#tabTax1" class="tab-link button active">新房</a>
<a href="#tabTax2" class="tab-link button">二手房</a>
</div>
</div>
<div class="tabs">
<div id="tabTax1" class="tab active">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">建筑面积</div>
<div class="item-after">
<input type="number" id="input_area01" class="textAlignLeft" placeholder="请输入建筑面积">
<label>平米</label>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">单<small class="spacing">&nbsp;</small>价</div>
<div class="item-after">
<input type="number" id="input_unitPrice" class="textAlignLeft" placeholder="请输入单价">
<label>元/平米</label>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">是否首次购房</div>
<div class="item-after">
<div class="textAlignLeft" style="overflow:hidden;">
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox current"></i>
<label>是</label>
</div>
</label>
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox"></i>
<label>否</label>
</div>
</label>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">是否有电梯</div>
<div class="item-after">
<div class="textAlignLeft" style="overflow:hidden;">
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox current"></i>
<label>是</label>
</div>
</label>
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox"></i>
<label>否</label>
</div>
</label>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="content-block">
<p><a href="04_mine03_taxation02_reference.html" class="button button-big button-fill theme" id="calculation01_btn">开始计算</a></p>
</div>
</div>
<div id="tabTax2" class="tab">
<div class="list-block media-list">
<ul>
<li>
<a class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">物业类型</div>
<div class="item-after">
<input type="text" id="input_houseType" class="textAlignLeft" value="普通住宅">
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">计算方式</div>
<div class="item-after">
<input type="text" id="input_method" class="textAlignLeft" value="按总价计算">
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">房产购置年限</div>
<div class="item-after">
<input type="text" id="input_years" class="textAlignLeft" value="不满2年">
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">是否首次购房</div>
<div class="item-after">
<div class="textAlignLeft" style="overflow:hidden;">
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox current"></i>
<label>是</label>
</div>
</label>
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox"></i>
<label>否</label>
</div>
</label>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">是否唯一住房</div>
<div class="item-after">
<div class="textAlignLeft" style="overflow:hidden;">
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox current"></i>
<label>是</label>
</div>
</label>
<label class="label-checkbox item-content checkbox">
<div class="item-media">
<i class="icon icon-form-checkbox"></i>
<label>否</label>
</div>
</label>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">建筑面积</div>
<div class="item-after">
<input type="number" id="input_area02" class="textAlignLeft" placeholder="请输入建筑面积">
<label>平米</label>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">总<small class="spacing">&nbsp;</small>价</div>
<div class="item-after">
<input type="number" id="input_totalPrice" class="textAlignLeft" placeholder="请输入总价">
<label>万元</label>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="content-block">
<p><a href="04_mine03_taxation02_reference.html" class="button button-big button-fill theme" id="calculation02_btn">开始计算</a></p>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../config.js"></script>
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
/* 勾选 */
$(".checkbox").on("click", function () {
$(this).parent().find("i").removeClass("current");
$(this).find("i").addClass("current");
});
/* 选择-物业类型 */
$("#input_houseType").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01c">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">物业类型</h1>\
</header>',
cols: [
{
textAlign: "center",
values: ["普通住宅", "非普通住宅", "经济适用房"]
}
]
});
/* 选择-计算方式 */
$("#input_method").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01c">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">计算方式</h1>\
</header>',
cols: [
{
textAlign: "center",
values: ["按总价计算", "按差价计算"]
}
]
});
/* 选择-房产购置年限 */
$("#input_years").picker({
toolbarTemplate: '<header class="bar bar-nav bar-nav01 bar-nav01c">\
<button class="button button-link pull-right close-picker">确定</button>\
<h1 class="title">房产购置年限</h1>\
</header>',
cols: [
{
textAlign: "center",
values: ["不满2年", "2-5年", "5年以上"]
}
]
});
/* 错误提示 */
$("#calculation01_btn").on("click", function () {
var a = $("#input_area01").val();
var b = $("#input_unitPrice").val();
if(a == ""){
$.toast("请输入建筑面积");
return false;
}
else if(b == ""){
$.toast("请输入单价");
return false;
}
});
$("#calculation02_btn").on("click", function () {
var a = $("#input_area02").val();
var b = $("#input_totalPrice").val();
if(a == ""){
$.toast("请输入建筑面积");
return false;
}
else if(b == ""){
$.toast("请输入总价");
return false;
}
});
</script>
</body>
</html>
+21 -17
View File
@@ -120,9 +120,9 @@
<img src="../../images/headPortrait.png" id="user_headImg" onclick="gotoUpdatePass()">
<p id="user_mobile"><br><span class="tag"><!--<small>土豪</small>--></span></p>
</div>
<div class="topic">
<div class="topic" id="toolList" v-bind:style="{display:haveTools}">
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home homeWin" id="toolList">
<div class="topicContent_center home homeWin" >
<!--<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
@@ -146,11 +146,11 @@
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab" v-cloak>
<a href="#tabList1" class="tab-link button active">房产({{mh_num}})</a>
<a href="#tabList2" class="tab-link button">关注({{mf_num}})</a>
<a href="#tabList3" class="tab-link button">收藏({{mc_num}})</a>
<a href="#tabList4" class="tab-link button">消息({{mm_num}})</a>
<div class="buttons-tab fixed-tab theme" data-offset="44">
<a href="#tabList1" class="tab-link button active" id="mh_num">房产(0)</a>
<a href="#tabList2" class="tab-link button" id="mf_num">关注(0)</a>
<a href="#tabList3" class="tab-link button" id="mc_num">收藏(0)</a>
<a href="#tabList4" class="tab-link button" id="mm_num">消息(0)</a>
</div>
<div class="contentBox">
<div>
@@ -249,15 +249,15 @@ $.init();
//定义个人手机号,贷款页面需要传参数
var _mobile;
var tab = new Vue({
el:"#tab",
data:{
mh_num:"0",
mf_num:"0",
mc_num:"0",
mm_num:"0"
}
})
//var tab = new Vue({
// el:"#tab",
// data:{
// mh_num:"0",
// mf_num:"0",
// mc_num:"0",
// mm_num:"0"
// }
//})
//判断是否登录
function checkIsLogin(){
@@ -511,7 +511,8 @@ function loadToolList (){
el:"#toolList",
data:{
merchantTools:[],
userId:""
userId:"",
haveTools:"none"
},
methods:{
goto:function(url,userId,id){
@@ -536,6 +537,9 @@ function loadToolList (){
axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{position:0}}).then(function(response){
toolList.merchantTools = response.data.data.list;
toolList.userId = response.data.data.uid;
if(response.data.data.list.length>0){
toolList.haveTools = "block";
}
/* 获取homeWin div个数并计算homeWin宽度 */
var original = 0;//公积金查询等个数
$(".homeWin").css("width",(90*(original+response.data.data.list.length))+"px");