From 950c75532fcf152a1d1fa547c6097cd598f7dde2 Mon Sep 17 00:00:00 2001 From: bayi Date: Tue, 8 May 2018 09:31:54 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 e7f4d648adb4cca9d7664ae1887db1c5477e3297 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 11:00:57 +0800 Subject: [PATCH 4/4] =?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} + +