diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 369d1c2..49f7e75 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,14 +1,9 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -<<<<<<< HEAD -var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; -======= //var BASE_PATH = "http://192.168.10.47:8086"; ->>>>>>> 9c25ef0b2e3f9e2a19df5038da587d6c53827469 -//var BASE_PATH = "http://192.168.10.53:8084"; -var BASE_PATH = "http://192.168.10.161:8084"; +var BASE_PATH = "http://192.168.10.53:8084"; +//var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; //var BASE_PATH = "http://192.168.10.164:8084"; diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index b565f64..4f34b3a 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -542,8 +542,11 @@ function showRentChart2(categories, series, roomDatas){ fontSize: 12 }, formatter: function (params) { - var res = params[0].name + '
' + "租金:"+params[0].value + '元/月'; - return res; + if(params[0].value){ + var res = params[0].name + '
' + "租金:"+params[0].value + '元/月'; + return res; + } + } }, grid:{ diff --git a/fangija-zsyf/js/log/log_stat.js b/fangija-zsyf/js/log/log_stat.js index 627ad88..d4e7d16 100644 --- a/fangija-zsyf/js/log/log_stat.js +++ b/fangija-zsyf/js/log/log_stat.js @@ -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; 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/js/searchDistrict-app.js b/fangija-zsyf/js/searchDistrict-app.js index 172c95a..2fd9c37 100644 --- a/fangija-zsyf/js/searchDistrict-app.js +++ b/fangija-zsyf/js/searchDistrict-app.js @@ -122,7 +122,12 @@ $("body").delegate(".open-about02", "click", function () { eventType = "rentQueryClick"; }else{ cat = "district" - eventType = "priceQueryClick"; + if(text=="房价查询"){ + eventType = "priceQueryClick"; + }else{ + eventType = "districtSerachClick"; + } + } saveBehaviorLog(eventType,dataMap);//保存用户点击事件 $('.historyList').show(); @@ -189,6 +194,13 @@ var historyVue = new Vue({ histories: histories },methods: { openHistoryDetail:function(index) { + var eventType = "historyDistrictClick"; + var dataMap = {}; + dataMap["city"]=this.histories[index].city; + dataMap["region"]=this.histories[index].region; + dataMap["name"]=this.histories[index].name; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + if(cat == "rent"){ clicked('views/rent/rent.html',true,false,{},{city:this.histories[index].city,region:this.histories[index].region,name:this.histories[index].name}) }else{ diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index c49a6a5..5c2139b 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -28,9 +28,14 @@ function selectHouseInfoList(){ var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; var xqPotentialIndexMap = resultsMap.xqPotentialIndexMap; var houseInfoTotalMap = resultsMap.houseInfoTotalMap; + //调整统计num的顺序 + mh_totalRecords = resultsMap.houseInfoPageList.totalRecords; + tab.mh_num = mh_totalRecords; + if(resultList != null && resultList.length == 0){ // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip1').hide(); + //$('#loadTip1').remove(); //$('.infinite-scroll-preloader').remove(); // 加载完毕,则注销无限加载事件,以防不必要的加载 //$.detachInfiniteScroll($('.infinite-scroll')); @@ -39,7 +44,8 @@ function selectHouseInfoList(){ if(resultsMap.houseInfoPageList.currentPage == resultsMap.houseInfoPageList.totalPages){ //如果此次查询刚好是page = totalPages // 删除加载提示符 - $('#loadTip1').remove(); + $('#loadTip1').hide(); + //$('#loadTip1').remove(); //$('.infinite-scroll-preloader').remove(); // 加载完毕,则注销无限加载事件,以防不必要的加载 //$.detachInfiniteScroll($('.infinite-scroll')); @@ -57,8 +63,6 @@ function selectHouseInfoList(){ mh_page = resultsMap.houseInfoPageList.currentPage; mh_pageSize = resultsMap.houseInfoPageList.limit; mh_totalPages = resultsMap.houseInfoPageList.totalPages; - mh_totalRecords = resultsMap.houseInfoPageList.totalRecords; - tab.mh_num = mh_totalRecords; mhAddItems(mh_itemsPerLoad, mh_lastIndex, dataObj, xqOneMonthUpDownRangeMap, xqPotentialIndexMap, houseInfoTotalMap); }).catch(function (error) { console.log(error); diff --git a/fangija-zsyf/js/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js index e9fa97d..d43a651 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -76,10 +76,13 @@ function messageGoto(_this,operation,operationPage,mid){ } if(operation==1){ var pages = operationPage+'.html'; - if(plus.webview.getWebviewById(pages)==null){ - plus.webview.create(pages, pages, subpage_style); - } - plus.webview.show(pages); +// if(plus.webview.getWebviewById(pages)==null){ +// plus.webview.create(pages, pages, subpage_style); +// } +// plus.webview.show(pages); + mui.fire(plus.webview.getWebviewById('HBuilder'),'switchView',{ + name:pages + }); } if(operation==2){ if (operationPage != null && operationPage != "") { diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index b0b0305..3baae00 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -30,22 +30,22 @@