diff --git a/lib/java110/utils/date.js b/lib/java110/utils/date.js index 7371be7..eacba86 100644 --- a/lib/java110/utils/date.js +++ b/lib/java110/utils/date.js @@ -222,5 +222,15 @@ export default { second = '0' + second; } return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; + }, + + /** + * @param {Object} date日期 Y-m-d H:i:s + * @param {Object} days 天数 + */ + decSomeDays: function(date, days){ + let timestamp = new Date(date.replace(/-/g, '/')).getTime(); + let decstamp = 60 * 60 * 24 * 1000 * days; + return this.formatDate(new Date(timestamp - decstamp)); } } diff --git a/pages/feeDetail/feeDetail.vue b/pages/feeDetail/feeDetail.vue index ed76678..d24c44d 100644 --- a/pages/feeDetail/feeDetail.vue +++ b/pages/feeDetail/feeDetail.vue @@ -11,7 +11,7 @@ 到期时间 - {{feeInfo.endTime}} + {{feeInfo.deadlineTime}} 费用标识 @@ -53,6 +53,7 @@ queryFeeDetail } from '../../api/fee/fee.js'; import {getCurrentCommunity} from '../../api/community/community.js' + import dateUtil from '../../lib/java110/utils/date.js' export default { data() { return { @@ -117,7 +118,12 @@ } let _fees = res.data.fees; _that.feeInfo = _fees[0]; - + // 周期费用 结束日期 -1 天; 其他不变 + if(_that.feeInfo.feeFlag == '1003006'){ + _that.feeInfo.deadlineTime = dateUtil.decSomeDays(_that.feeInfo.deadlineTime, 1); + }else{ + _that.feeInfo.deadlineTime = dateUtil.formatDate(new Date(_that.feeInfo.deadlineTime.replace(/-/g, '/'))); + } }) }, } diff --git a/pages/roomPayFee/roomPayFee.vue b/pages/roomPayFee/roomPayFee.vue index 35d9670..d4231e7 100644 --- a/pages/roomPayFee/roomPayFee.vue +++ b/pages/roomPayFee/roomPayFee.vue @@ -154,7 +154,6 @@ return; } let _that = this; - _that.receivableAmount = 0.0; let _objData = { payObjId: this.roomInfo.roomId, payObjType: '3333', @@ -175,6 +174,7 @@ _that.fees = []; }) .then(function(_fees) { + _that.receivableAmount = 0.0; _fees.forEach(function(_item) { _that.receivableAmount += _item.feePrice;