From 78d18255e9d5f41faf9e3e35256128d9083154fb Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 15:28:15 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=88=BF=E4=BA=A7=E7=83=AD=E7=82=B9?= =?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/house/houseDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index f625d72..ba4f4a3 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -151,7 +151,7 @@ -
+
房产热点城市
From bac1db671e3b2c71eff1b9ed118fe77834a9fa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 7 May 2018 16:22:40 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7id=E5=AD=98=E5=82=A8=E5=88=B0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/log/log_stat.js | 1 + fangija-zsyf/js/login/codeSms.js | 1 + fangija-zsyf/js/login/thirdLogin.js | 4 +++- fangija-zsyf/main.html | 1 + fangija-zsyf/views/setting/setting.html | 1 + fangija-zsyf/views/user/bindingMobile.html | 1 + fangija-zsyf/views/user/passLogin.html | 5 +++-- 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/js/log/log_stat.js b/fangija-zsyf/js/log/log_stat.js index 627ad88..864c815 100644 --- a/fangija-zsyf/js/log/log_stat.js +++ b/fangija-zsyf/js/log/log_stat.js @@ -55,6 +55,7 @@ function saveBehaviorLog(event,dataMap) { var device = plus.device.uuid; var model = plus.device.model; plus.geolocation.getCurrentPosition(function(p){ + baidu_province = p.address.province; baidu_city = p.address.city; baidu_lng = p.coords.longitude; baidu_lat = p.coords.latitude; diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js index c02fb57..3b729c4 100644 --- a/fangija-zsyf/js/login/codeSms.js +++ b/fangija-zsyf/js/login/codeSms.js @@ -80,6 +80,7 @@ $("#login_btn").on("click", function () { var data = resData.data; localStorage.setItem("user_token", data.token); localStorage.setItem("user_token_add_time", new Date().getTime()); + localStorage.setItem("user_id", data.uid); $.toast(resData.message); if (data.firstLogin) { // 显示设置密码页面 diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js index 9c548bc..1c9178f 100644 --- a/fangija-zsyf/js/login/thirdLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -105,8 +105,10 @@ function login(openid, unionid, accessToken, nickname, headImg, loginFrom, uri) back(); }) }else{ - localStorage.setItem("user_token", resData.data); + var data = resData.data; + localStorage.setItem("user_token", data.token); localStorage.setItem("user_token_add_time", new Date().getTime()); + localStorage.setItem("user_id", data.uid); back(); } }else{ diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 5bcc8b4..3baae00 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -71,6 +71,7 @@ if (day >= 25) { localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); + localStorage.removeItem("user_id"); } //mui初始化 mui.init(); diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index 2eccd67..cc66b54 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -120,6 +120,7 @@ function logout() { //plus.webview.getWebviewById('yfindex.html').reload(); localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); + localStorage.removeItem("user_id"); //退出登录之前loading下个人中心 if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { plus.webview.getWebviewById('views/house/houseDetail.html').reload(); diff --git a/fangija-zsyf/views/user/bindingMobile.html b/fangija-zsyf/views/user/bindingMobile.html index 937d2bd..fc105a5 100644 --- a/fangija-zsyf/views/user/bindingMobile.html +++ b/fangija-zsyf/views/user/bindingMobile.html @@ -200,6 +200,7 @@ var vue = new Vue({ $.toast(resData.message); localStorage.setItem("user_token", resData.data.token); localStorage.setItem("user_token_add_time", new Date().getTime()); + localStorage.setItem("user_id", resData.data.uid); back(); } else { $.toast(resData.message); diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index c6c13a6..b162900 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -136,9 +136,10 @@ new Vue({ var resData = response.data; if (resData.status) { // 用户登录成功的TOKEN - var token = resData.data; - localStorage.setItem("user_token", token); + var data = resData.data; + localStorage.setItem("user_token", data.token); localStorage.setItem("user_token_add_time", new Date().getTime()); + localStorage.setItem("user_id", data.uid) $.toast(resData.message); back(); } else { From edec635f6b6ce77a766e90841a9f860aef29d0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 7 May 2018 16:37:23 +0800 Subject: [PATCH 03/16] fix bug --- fangija-zsyf/js/log/log_stat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/js/log/log_stat.js b/fangija-zsyf/js/log/log_stat.js index 864c815..d4e7d16 100644 --- a/fangija-zsyf/js/log/log_stat.js +++ b/fangija-zsyf/js/log/log_stat.js @@ -57,6 +57,7 @@ function saveBehaviorLog(event,dataMap) { plus.geolocation.getCurrentPosition(function(p){ baidu_province = p.address.province; baidu_city = p.address.city; + baidu_region = p.address.district; baidu_lng = p.coords.longitude; baidu_lat = p.coords.latitude; baidu_address = p.address.street; From 76636f112284a0f978726d252c4e7af810eea9db Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 7 May 2018 17:17:30 +0800 Subject: [PATCH 04/16] aa --- fangija-zsyf/views/house/add.html | 13 +++++++++- fangija-zsyf/yfindex.html | 41 ++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index e828b8d..4f0f829 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1580,7 +1580,18 @@ $("#input_floor").picker({ textAlign: 'center', values: getfloorHeight() } - ] + ],onOpen:function(p){ + // + var input_floor = $("#input_floor").val(); + var num = input_floor.replace(/第/g,"").replace(/层/g,"").replace(/共/g,"").split(" "); + if(num[0]!=null &&num[0]!=undefined){ + p.cols[0].setValue('第'+num[0]+'层') + } + if(num[1]!=null &&num[1]!=undefined){ + p.cols[1].setValue('共'+num[1]+'层') + } + + } }); /* 选择-目前状态 */ diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index d7ab0db..316adf2 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1195,12 +1195,21 @@ $.config = {router: false} From 6507030946042aa7759b5c675279cd71adb2d092 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 7 May 2018 18:28:09 +0800 Subject: [PATCH 10/16] =?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 11/16] =?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 12/16] =?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 13/16] =?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 14/16] =?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 15/16] =?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 16/16] =?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);