From d4d2aa239246b825b5a6aa49f5a36c221f98a055 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Tue, 8 May 2018 17:22:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?YOUFANG1.0.4=20=E5=87=BA=E7=A7=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/rent/rentManager.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index 6dea18a..dbb481a 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -116,6 +116,7 @@ $.config = {router: false} + @@ -128,6 +129,10 @@ document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); id = self.houseId + var edit = new Vue({ + el:"#edit", + data:{liveStatus:"",leaseStartDate:"",leaseEndDate:"",lastRentDate:"",nowDay:"",rent:"",cycle:""} + }); axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){ // var data = response.data.data.houses; // $.each(data,function(i){ @@ -277,6 +282,10 @@ function onPlusReady() { $.toast("收租日期不能晚于到期日期"); return false; } + if (next_rent < rent_start) { + $.toast("收租日期不能早于起租日期"); + return false; + } if(next_rent Date: Tue, 8 May 2018 17:58:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E4=BD=8D=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 24 ++++++++++++------- fangija-zsyf/views/district/detail.html | 7 +++++- fangija-zsyf/views/evaluate/evaluateList.html | 3 ++- fangija-zsyf/views/house/detail.html | 1 + fangija-zsyf/views/house/houseManageList.html | 13 +++++++--- fangija-zsyf/views/rent/rent.html | 5 ++++ 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 6a837f0..8b9fcf3 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -11,12 +11,18 @@ var BASE_PATH = "http://192.168.10.164:8084"; var lauchFlag = false; /*广告位类型常量*/ -var TOU_ZI_SHOU_YI=0; -var JUN_JIA_PAI_MING=1; -var ZU_SHOU_BI=2; -var LIU_DONG_XING_PING_JI=3; -var XIANG_SI_XIAO_QU=4; -var HOME_PAGE_BANNER=5; -var LOAN_PAGE_BANNER=6; -var SET_QR_CODE=7; -var EVALUATE_REPORT=8; \ No newline at end of file +var TOU_ZI_SHOU_YI=0;//"房产分析/出租管理-租金回报率" +var JUN_JIA_PAI_MING=1;//"房产分析/出租管理-出租状态" +var ZU_SHOU_BI=2;//"出售分析-增长率收益" +var LIU_DONG_XING_PING_JI=3;//"出售分析-挂牌建议" +var XIANG_SI_XIAO_QU=4;//"置换建议-小区详情-顶部描述" +var HOME_PAGE_BANNER=5;//"首页banner" +var LOAN_PAGE_BANNER=6;//"贷款页banner" +var SET_QR_CODE=7;//"设置页二维码" +var EVALUATE_REPORT=8;//"有房评估报告-广告图" +var DISTRICT_DETAIL=9;// "有房小区详情-广告图" +var EVALUATE_LIST=10;// "有房房产评估列表-广告图" +var ESTATE_MARKET_COUNTRY=11;// "有房房产行情全国-广告图" +var ESTATE_MARKET_SHANGHAI=12;// "有房房产行情上海-广告图" +var ESTATE_DETAIL=13;// "有房房产详情-广告图" +var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图" \ No newline at end of file diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 65f9576..cc523cf 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -116,6 +116,8 @@ + +
小区走势分析
@@ -269,6 +271,8 @@ $.config = {router: false} + + - + + + diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index ebae184..3eb4108 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -84,6 +84,7 @@
+
@@ -192,6 +193,8 @@ $.config = {router: false} + + + +