From 9292319cbdecf416a9e2da339a9fd9ae52e2735a Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 7 May 2018 17:32:53 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateReport.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index ae37d41..8a6939c 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -299,6 +299,11 @@ $.config = {router: false} }) } } + if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){ + var device = plus.device.uuid; + var uid = localStorage.getItem("user_id"); + $("#img").attr("onclick","window.location.href="+h.link+"?uid="++"&device="+); + } loadingChart(h.city,h.region,h.name,2) //按照时间范围加载数据 $(".avgPriceTrend a").click(function(){ From d8372b1daaf7ff413d54a7067eedd2f112abbda7 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 7 May 2018 17:59:52 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 3 ++- fangija-zsyf/views/evaluate/evaluateReport.html | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 49f7e75..69bc7ac 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -2,7 +2,8 @@ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -var BASE_PATH = "http://192.168.10.53:8084"; +//var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.164:8084"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 94e99ac..d9b9318 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -105,7 +105,7 @@ - +
均价走势
@@ -300,16 +300,19 @@ $.config = {router: false} if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){ $("#img").attr("src",BASE_PATH+"/img/"+h.imgId); //控制贷款按钮是否可以显示,便于ios版本审核 - if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){ - $("#img").click(function(){ - clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){}) - }) - } +// if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){ +// $("#img").click(function(){ +// clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){}) +// }) +// } } if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){ var device = plus.device.uuid; var uid = localStorage.getItem("user_id"); - $("#img").attr("onclick","window.location.href="+h.link+"?uid="++"&device="+); + $("#img_ad").click(function(){ + url=h.link+"?uid="+uid+"&device="+device; + clicked('views/webview_embed.html', true,false,{},{url:this.url}); + }); } loadingChart(h.city,h.region,h.name,2) //按照时间范围加载数据 From b25ea34d3937202e72b9b8707bf2882df6d614f1 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 18:09:27 +0800 Subject: [PATCH 03/38] =?UTF-8?q?=E7=BD=AE=E6=8D=A2=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E4=BF=9D=E7=95=992=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 4 ++-- fangija-zsyf/views/changeHouse/index.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 49f7e75..7d545f7 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -//var BASE_PATH = "http://192.168.10.47:8086"; -var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.47:8086"; +//var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index a6ab26a..4535cb3 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1446,7 +1446,7 @@ function addBaseHouseInfo(obj){ var funds = $("#input_funds").val(); if(funds){ - baseInfo.sumPrice = parseInt(funds) + parseInt(obj.totalPrice/10000); + baseInfo.sumPrice = (Number(funds)+ parseInt(obj.totalPrice/10000)).toFixed(2); }else{ baseInfo.sumPrice = parseInt(obj.totalPrice/10000); } @@ -1536,9 +1536,9 @@ function calTotalPrice(){ if(funds && price){ if(a){ var tax = a * price/100; - baseInfo.sumPrice = (parseInt(funds)+parseInt(price)-tax).toFixed(2); + baseInfo.sumPrice = (Number(funds)+parseInt(price)-tax).toFixed(2); }else{ - baseInfo.sumPrice = (parseInt(funds)+parseInt(price)).toFixed(2); + baseInfo.sumPrice = (Number(funds)+parseInt(price)).toFixed(2); } }else if(price){ if(a){ From f7b71b7206602494e14016c055936e1126510118 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 18:23:29 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E7=83=AD=E7=82=B9=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E7=82=B9=E5=91=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/changeHouse/index.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 4535cb3..1eadbfe 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1709,6 +1709,8 @@ $("#select_area").RangeSlider({min: 0, max: 100, step: 14.2857, callback: change /* 弹出城市选择页面 */ $(document).on("click",".open-about01", function () { + $("#citySearchInp").val(""); + $("#selectContainer").hide(); $.popup(".popup-about01"); }); @@ -1848,6 +1850,17 @@ function openAddHouse(){ clicked('/views/house/add.html',true,false,{},{}); } +/* 定位城市 */ +$("body").on("click", ".letter a", function () { + var s = $(this).html(); + $(".popup-about01 .content").scrollTop(0); + $(".popup-about01 .content").scrollTop($("#" + s + "1").offset().top - 106); +}); +$("#tabCity1 .content-block01").scroll(function () { + $("#tabCity1 .content-block01 .letter").css("position","absolute"); + $("#tabCity1 .content-block01 .letter").css("top", 85 - $("#cityContainer").position().top); +}); + From 6507030946042aa7759b5c675279cd71adb2d092 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 7 May 2018 18:28:09 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=20=20=E6=88=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?js=E6=9E=84=E9=80=A0=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index a8ef1ba..f56fd04 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -517,9 +517,9 @@ function addItemsChengJiao(resultsMap){ var tempTotalPrice = resultsMap.sells[i].total_price == 0?"暂无":(parseFloat(resultsMap.sells[i].total_price)/10000).toFixed(2)+"万"; var tempAvgPrice = resultsMap.sells[i].avg_price == 0?"暂无":resultsMap.sells[i].avg_price+"元/㎡"; var tradeDate = resultsMap.sells[i].trade_date == null?"暂无":formatTime(resultsMap.sells[i].trade_date)+"签约"; - htmlChengJiao += "
"+tempTotalPrice+"
"; var direction_floor = (resultsMap.sells[i].direction == undefined || resultsMap.sells[i].direction == "")?"":resultsMap.sells[i].direction; direction_floor += (resultsMap.sells[i].floor == undefined || resultsMap.sells[i].floor == "")?"":resultsMap.sells[i].floor + "层"; + htmlChengJiao += "
"+tempTotalPrice+"
"; htmlChengJiao += "
"+direction_floor+"
"; htmlChengJiao += "
"+tempAvgPrice+"
"; htmlChengJiao += "
"+tradeDate+"
"; @@ -528,24 +528,24 @@ function addItemsChengJiao(resultsMap){ } if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){ if(resultsMap.sells!=null && resultsMap.sells.length>0){ - htmlGuaPai += '
'; $('#showTopic2').html(htmlChengJiao); From a5eebdf0e1f68cadfd8c7a3fbdbe3819d659bbd0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 18:33:25 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=9F=8E=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/changeHouse/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 1eadbfe..ed62f00 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1401,6 +1401,7 @@ function updateChangeSubtation(hsId){ sellToBuy(); } $("#input_city").text(hs.intentionCity) + loadingRegion(hs.intentionCity); selectTxt("select_region", hs.intentionRegion); selectTxt("select_result", hs.intentionTags); From 4e3720cc5de3d0ba052b6b85fb905f901e779abc Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 7 May 2018 18:45:16 +0800 Subject: [PATCH 07/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateReport.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index d9b9318..dccdbd9 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -305,12 +305,13 @@ $.config = {router: false} // clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){}) // }) // } - } + } if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){ var device = plus.device.uuid; var uid = localStorage.getItem("user_id"); $("#img_ad").click(function(){ url=h.link+"?uid="+uid+"&device="+device; + //window.location.href=url; clicked('views/webview_embed.html', true,false,{},{url:this.url}); }); } From 79a4e643c122040d37a1cc292ca7454bb335d122 Mon Sep 17 00:00:00 2001 From: bayi Date: Mon, 7 May 2018 18:47:21 +0800 Subject: [PATCH 08/38] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateReport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index dccdbd9..04fce91 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -312,7 +312,7 @@ $.config = {router: false} $("#img_ad").click(function(){ url=h.link+"?uid="+uid+"&device="+device; //window.location.href=url; - clicked('views/webview_embed.html', true,false,{},{url:this.url}); + clicked("../webview_embed.html', true,false,{},{url:this.url}); }); } loadingChart(h.city,h.region,h.name,2) From 950c75532fcf152a1d1fa547c6097cd598f7dde2 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 8 May 2018 09:31:54 +0800 Subject: [PATCH 09/38] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateReport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 04fce91..16e6f5d 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -312,7 +312,7 @@ $.config = {router: false} $("#img_ad").click(function(){ url=h.link+"?uid="+uid+"&device="+device; //window.location.href=url; - clicked("../webview_embed.html', true,false,{},{url:this.url}); + clicked("/views/webview_embed.html", true,false,{},{url:url}); }); } loadingChart(h.city,h.region,h.name,2) From 5a7c5f8eef96762789b63222e56f3c4ff0c6566f Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Tue, 8 May 2018 09:36:58 +0800 Subject: [PATCH 10/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=90=E5=87=BA?= =?UTF-8?q?=E5=94=AE=E5=88=86=E6=9E=90=E3=80=91-=E6=8C=82=E7=89=8C?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=A4=84=E6=98=BE=E7=A4=BA=E4=BA=86=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7=20=E2=80=9C>=E2=80=9D=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/saleAnalysis/saleAnalysis.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js index f56fd04..b3a6aaa 100644 --- a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js +++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js @@ -380,9 +380,9 @@ function getAnalysisDetail(){ //增长率及收益跳转链接是否显示 if(resultsMap.ad!=null){ $('#showAdBox1').show(); - $('#showAdBox1Content').html(resultsMap.ad.content + ""); //如果link有值,添加调整路径 - if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0){ + if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0 && resultsMap.ad.content!=null && resultsMap.ad.content.length>0){ + $('#showAdBox1Content').html(resultsMap.ad.content + ""); $("#showAdBox1").click(function(){ clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad.link}) }) @@ -403,9 +403,9 @@ function getAnalysisDetail(){ //挂牌建议跳转链接是否显示 if(resultsMap.ad1!=null){ $('#showAdBox2').show(); - $('#showAdBox2Content').html(resultsMap.ad1.content + ""); //如果link有值,添加调整路径 - if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0){ + if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0 && resultsMap.ad1.content!=null && resultsMap.ad1.content.length>0){ + $('#showAdBox2Content').html(resultsMap.ad1.content + ""); $("#showAdBox2").click(function(){ clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad1.link}) }) From 006406c4aeebebb631d61a72701ea05fc321eacb Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 10:41:40 +0800 Subject: [PATCH 11/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=BF=E4=BA=A7?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/changeHouse/index.html | 7 +++- fangija-zsyf/views/house/add.html | 43 ++++++++++++++++------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index ed62f00..da29f67 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1294,6 +1294,8 @@ var houseListData = new Vue({ }, created:function(){ this.loadHouses(); + + } }) @@ -1363,6 +1365,7 @@ function onPlusReady() { //小区报告页带入 fillHouseInfo(houseId); } + } //修改置换建议填充默认值 @@ -1848,7 +1851,9 @@ $("#citySearchInp").bind('keyup', function() { }); function openAddHouse(){ - clicked('/views/house/add.html',true,false,{},{}); + clicked('/views/house/add.html',true,false,{},{source:"changeHouse"},function(){ + houseListData.loadHouses(); + }); } /* 定位城市 */ diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 4f0f829..f8b350d 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1246,10 +1246,12 @@ $.config = {router: false} document.addEventListener('plusready', onPlusReady, false); var houseStatus; //= "186182250936643584"; //扩展API加载完毕,现在可以正常调用扩展API - var type = 1; +var type = 1; +var source = "" function onPlusReady(){ var self = plus.webview.currentWebview(); type = self.type; //type为1时是我的房产 + source = self.source if(type==0){ $("#liveStatusDiv").show(); }else{ @@ -1875,6 +1877,7 @@ function checkIsLogin(){ function addEvaluation(){ var data={}; + if(type==0){ data={id:requestId,cityDisplay: $("#input_city").val(), region:$("input[name=region]").val(), @@ -1892,6 +1895,12 @@ function addEvaluation(){ lastRentDate:$("#input_time03").val(), houseStatus:0} }else{ + + houseStatus = 1; + if(source=="changeHouse"){ + houseStatus = 0; + } + data={id:requestId,cityDisplay: $("#input_city").val(), region:$("input[name=region]").val(), district:$("#input_address").val(), @@ -1900,7 +1909,7 @@ function addEvaluation(){ loudongName:$("#input_building").val(), floorName:$("#input_floor").val(), area:$("#input_area").val(), - houseStatus:1} + houseStatus:houseStatus} } var eventType = "evaluateSubmitClick"; saveBehaviorLog(eventType,data); //保存用户点击事件 @@ -1910,19 +1919,27 @@ function addEvaluation(){ }) .then(function (response) { if(response.data.data!=null && response.data.data.success){ - $("#evaluation_btn").removeAttr("disabled"); - var id = response.data.data.id; - - if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + + if(source=="changeHouse"){ + back(),plus.nativeUI.closeWaiting(); + + + }else{ + $("#evaluation_btn").removeAttr("disabled"); + var id = response.data.data.id; + + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } + clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){ + getRequestId(); + }) } - if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - } - clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){ - getRequestId(); - }) }else{ $("#evaluation_btn").removeAttr("disabled"); $.toast(response.data.message); From b53ad6ca73e7e2d2071085eb574b0c1eced9f716 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Tue, 8 May 2018 10:43:36 +0800 Subject: [PATCH 12/38] YOUFANG1.0.3 --- fangija-zsyf/js/push-common.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index 1c9eb7d..27bb1d2 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -5,6 +5,10 @@ document.addEventListener("plusready", function() { // 监听点击消息事件 plus.push.addEventListener("click", function(msg) { + //刷新个人中心 + if (plus.webview.getWebviewById('views/user/userInfo.html') != null) { + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } // 判断是从本地创建还是离线推送的消息 var payload = msg.payload; var title = msg.title; @@ -87,6 +91,10 @@ document.addEventListener("plusready", function() { // 监听在线消息事件, iOS透传消息在线时会进入这里进行处理 plus.push.addEventListener("receive", function(msg) { + //刷新个人中心 + if (plus.webview.getWebviewById('views/user/userInfo.html') != null) { + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } var title = msg.title; var content = msg.content; var payload = msg.payload; From e7f4d648adb4cca9d7664ae1887db1c5477e3297 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 11:00:57 +0800 Subject: [PATCH 13/38] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E6=8D=A2=E5=8C=97=E4=BA=AC=EF=BC=8C=E5=AE=9A=E4=BD=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/changeHouse/index.html | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index da29f67..13d81eb 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1247,6 +1247,8 @@ $.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 24/38] =?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} + + + + From 8773daf02cbf58999d54e74ba534689c75e97543 Mon Sep 17 00:00:00 2001 From: bayi Date: Wed, 9 May 2018 10:24:07 +0800 Subject: [PATCH 32/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseDetail.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 1a6a312..55a7d5e 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -80,6 +80,9 @@
+ + +
@@ -202,6 +205,8 @@ + +
{{myCityMap.time}}楼市行情区县涨跌详情
@@ -1216,7 +1221,8 @@ $.config = {router: false} - + +