From 55b334eb5f7af6dc17776f9f0abf7a3afe680349 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 10:42:34 +0800 Subject: [PATCH 01/24] log --- fangija-zsyf/views/changeHouse/index.html | 1 + fangija-zsyf/views/changeHouse/result.html | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 8fe9bb4..2284b1a 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1353,6 +1353,7 @@ document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); hsId = self.hsId + // alert("index:"+hsId); if(hsId){ //如果是修改置换建议,则默认将值填入 axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{ diff --git a/fangija-zsyf/views/changeHouse/result.html b/fangija-zsyf/views/changeHouse/result.html index c5ed03f..221add4 100644 --- a/fangija-zsyf/views/changeHouse/result.html +++ b/fangija-zsyf/views/changeHouse/result.html @@ -129,7 +129,7 @@

抱歉,没有找到适合您的小区

- 修改置换需求 + 修改置换需求
@@ -399,6 +399,7 @@ $(document).on('infinite', '.infinite-scroll-bottom', function() { }); function updateChangeHouse(){ + alert(hsId); clicked('views/changeHouse/index.html',true,false,{},{hsId:hsId}); } From 1d05e88b1be26b9052176ebf3f87dcc3750a37d8 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 7 May 2018 11:12:35 +0800 Subject: [PATCH 02/24] YOUFANG1.0.4 --- fangija-zsyf/manifest.json | 4 ++- fangija-zsyf/views/user/userInfo.html | 51 ++++++++++++++++----------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index d410221..ff296a5 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1502,7 +1502,9 @@ "yfindex.html", "views/house/houseDetail.html" ], - "refer": [], + "refer": [ + "views/user/userInfo.html" + ], "priority": 0 }, "yfindex.html": { diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index ed68854..85d33da 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -50,7 +50,7 @@

立即登录

-
+ @@ -503,15 +503,19 @@ function onPlusReady(){ userId:"" }, methods:{ - goto:function(url,userId){ + goto:function(url,userId,id){ var deviceId = plus.device.uuid; if(url.indexOf("?")>0){ url+=("&uid="+userId+"&deviceId="+deviceId) }else{ url+=("?uid="+userId+"&deviceId="+deviceId) } - alert(url) if (url != null && url != "") { + axios.post(BASE_PATH + "/rest/usertool/merchantToolClick",{id:id}).then(function(response){ + + }).catch(function(error){ + + }); clicked('../webview_embed.html', true,false,{},{url:url}) } } From 470896f3d7a39d16fb36ec4048a3fde7be9296ff Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 7 May 2018 15:17:27 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/district/detail.html | 22 +++++++++++++++++-- fangija-zsyf/views/house/detail.html | 19 +++++++++++++++- fangija-zsyf/views/house/houseList.html | 6 +++++ fangija-zsyf/views/house/houseManageList.html | 5 +++++ fangija-zsyf/views/user/userInfo.html | 18 +++++++++++++++ 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 15b88e3..5706a60 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -57,7 +57,7 @@ -

{{name}}

@@ -329,6 +329,14 @@ function onPlusReady() { sharehrefTitle = self.name; + //查看小区 + var eventType = "openDistrictDetailClick"; + var dataMap = {}; + dataMap["city"]=city; + dataMap["region"]=region; + dataMap["name"]=name; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + // 创建根实例 baseInfo = new Vue({ el: '#districtBaseInfo', @@ -396,7 +404,17 @@ function loadMap(){ } } - +function share(){ + var eventType = "shareDistrictClick"; + var dataMap = {}; + dataMap["city"]=city; + dataMap["region"]=region; + dataMap["name"]=name; + dataMap["type"]="districtDetail"; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + + shareHref(); +} diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index a2ecc08..a5e5bc7 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -626,15 +626,32 @@ function gotoLoanApply(){ clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){}) } function gotoRentManager(){ - clicked('/views/rent/rentManager.html',true,false,{},{houseId: houseId},function(){}) + + var eventType = "rentManageClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + + clicked('/views/rent/rentManager.html',true,false,{},{houseId: houseId},function(){}) } //出售分析 function gotoSaleAnalysis(){ + var eventType = "saleAnalysisClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId, city: oriCity, region: oriRegion, name: oriName},function(){}) } function gotoChangeHouse(){ + + var eventType = "changeHouseClick"; + var dataMap = {}; + dataMap["hid"]=houseId; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/changeHouse/index.html',true,false,{},{houseId: houseId},function(){}) } diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index b312ab5..7050d75 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -387,6 +387,12 @@ $(document).on("click",".confirm-ok", function () { //获取删除的房产id var id = $(this).attr("id"); $.confirm("确定删除?", function () { + + var eventType = "deleteHouseClick"; + var dataMap = {}; + dataMap["hid"]=id; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus", { id: id diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 2716cbe..96ad91e 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -147,6 +147,11 @@ $(document).on("click",".confirm-ok", function () { //获取删除的房产id var id = $(this).attr("id"); $.confirm("确定删除?", function () { + var eventType = "delateEvaluateClick"; + var dataMap = {}; + dataMap["hid"]=id; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + axios.post(BASE_PATH + "/rest/index/deleteHouseInfoByStatus", { id: id diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 56f9594..65ede6d 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -525,6 +525,24 @@ function onPlusReady(){ checkIsLogin(); } +$("a[href='#tabList1'],a[href='#tabList2'],a[href='#tabList3']").click(function(){ + var eventType = ""; + var type = $(this).text(); + if(type.indexOf("房产") >= 0){ + eventType = "userInfo_manageHouseClick"; + }else if(type.indexOf("关注") >= 0){ + eventType = "userInfo_attentionClick"; + }else if(type.indexOf("收藏") >= 0){ + eventType = "userInfo_collectClick"; + } + saveLog(eventType) +}) + +function saveLog(eventType){ + var dataMap = {}; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 +} +saveLog("userInfo_manageHouseClick");//默认第一次会调到该方法 From ce7e66430deb14ec43b6ca67fab16b2b2c2abc0c 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 15:18:33 +0800 Subject: [PATCH 18/24] fix bug --- fangija-zsyf/main.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index df12e7a..5bcc8b4 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -142,10 +142,10 @@ //title.innerHTML = this.querySelector('.mui-tab-label').innerHTML; //显示目标选项卡 //若为iOS平台或非首次显示,则直接显示 + if(plus.webview.getWebviewById(targetTab)==null){ + plus.webview.create(targetTab, targetTab, subpage_style) + } if(mui.os.ios||aniShow[targetTab]){ - if(plus.webview.getWebviewById(targetTab)==null){ - plus.webview.create(targetTab, targetTab, subpage_style) - } plus.webview.show(targetTab); }else{ //否则,使用fade-in动画,且保存变量 From 5dafe2a30b97de48028693cecf052e786da697dd Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 7 May 2018 15:23:04 +0800 Subject: [PATCH 19/24] YOUFANG1.0.4 --- fangija-zsyf/views/user/userInfo.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 341601b..aca1c3c 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -511,11 +511,11 @@ function onPlusReady(){ url+=("?uid="+userId+"&deviceId="+deviceId) } if (url != null && url != "") { - axios.post(BASE_PATH + "/rest/usertool/merchantToolClick",{id:id}).then(function(response){ - - }).catch(function(error){ - - }); + if(id!=null){ + axios.post(BASE_PATH + "/rest/usertool/merchantToolClick",{id:id}).then(function(response){ + }).catch(function(error){ + }); + } clicked('../webview_embed.html', true,false,{},{url:url}) } } From 78d18255e9d5f41faf9e3e35256128d9083154fb Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 7 May 2018 15:28:15 +0800 Subject: [PATCH 20/24] =?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 21/24] =?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 22/24] 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 23/24] 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}