Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
2018-04-18 15:57:54 +08:00
2 changed files with 20 additions and 5 deletions
+2 -2
View File
@@ -1063,8 +1063,8 @@ input::-webkit-input-placeholder{
.topBg02 p a{font-size:0.75rem;}
.collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;}
.collection02{border:solid 1px #C3C0BC;color:#999;}
.collection02:active{border:solid 1px #C3C0BC;color:#999;}
.button.collection02{border:solid 1px #C3C0BC;color:#999;}
.button.collection02:active{border:solid 1px #C3C0BC;color:#999;}
.icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
.icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
+18 -3
View File
@@ -173,7 +173,7 @@
<div class="item-title-row">
<div class="item-title">每期租金</div>
<div class="item-after">
<input type="number" id="input_rent01" class="textAlignLeft" placeholder="请输入每期租金">
<input type="number" id="input_rent" class="textAlignLeft" placeholder="请输入每期租金">
<label>元</label>
</div>
</div>
@@ -1733,7 +1733,7 @@ $("#evaluation_btn").on("click", function () {
$.toast("到期日期必须晚于起租日期");
return false;
}
var nowDay = new Date().format("yyyy-MM-dd");
var nowDay = formatTime(new Date());
if($("#input_time02").val()<nowDay){
$("#evaluation_btn").removeAttr("disabled");
$.toast("到期日期不能早于今天");
@@ -1772,7 +1772,9 @@ $("#evaluation_btn").on("click", function () {
$.toast("收租日期不能晚于到期日期");
return false;
}
if($("#input_time03").val()<i){
alert($("#input_time03").val())
alert(nowDay)
if($("#input_time03").val()<nowDay){
$("#evaluation_btn").removeAttr("disabled");
$.toast("下次收租日期不能早于今天");
return false;
@@ -1822,6 +1824,19 @@ $("#evaluation_btn").on("click", function () {
});
});
function formatTime(time){
var now = new Date(time);
var year=now.getFullYear();
var month=now.getMonth()+1;
if(month<10){
month = "0"+month
}
var date=now.getDate();
if(date<10){
date = "0"+date
}
return year+"-"+month+"-"+date;
}
//判断是否登录
//var loginFlag=false;
function checkIsLogin(){