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 1/6] =?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 2/6] 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 3/6] 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}