Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4

This commit is contained in:
xuhe@fangjia.com
2018-05-07 17:17:39 +08:00
9 changed files with 21 additions and 12 deletions
+2
View File
@@ -55,7 +55,9 @@ 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_region = p.address.district;
baidu_lng = p.coords.longitude;
baidu_lat = p.coords.latitude;
baidu_address = p.address.street;
+1
View File
@@ -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) {
// 显示设置密码页面
+3 -1
View File
@@ -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{
+4 -3
View File
@@ -71,6 +71,7 @@
if (day >= 25) {
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
localStorage.removeItem("user_id");
}
//mui初始化
mui.init();
@@ -142,10 +143,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动画,且保存变量
+1 -1
View File
@@ -151,7 +151,7 @@
</div>
</div>
</div>
<div class="topic" id="hotCityVue">
<div class="topic" id="hotCityVue" v-cloak>
<div class="topicTitle">房产热点城市</div>
<div class="topicContent cityImgBox row">
<div class="col-33" v-for="(city,index) in hotCitys" @click="openHotCity(index)">
+1
View File
@@ -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();
@@ -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);
+3 -2
View File
@@ -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 {
+5 -5
View File
@@ -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})
}
}