diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index ff023e2..7d545f7 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,10 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -//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"; -var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.47:8086"; +//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"; diff --git a/fangija-zsyf/js/searchDistrict-app.js b/fangija-zsyf/js/searchDistrict-app.js index 172c95a..0c5e5b8 100644 --- a/fangija-zsyf/js/searchDistrict-app.js +++ b/fangija-zsyf/js/searchDistrict-app.js @@ -189,6 +189,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/myMessage.js b/fangija-zsyf/js/user/myMessage.js index e9fa97d..d0fb66c 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -75,11 +75,14 @@ function messageGoto(_this,operation,operationPage,mid){ clicked('/views/message/detail.html',true,false,{},{mid:mid},function(){}) } if(operation==1){ - var pages = operationPage+'.html'; - if(plus.webview.getWebviewById(pages)==null){ - plus.webview.create(pages, pages, subpage_style); - } - plus.webview.show(pages); +// var pages = operationPage+'.html'; +// 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:"views/house/houseDetail.html" + }); } if(operation==2){ if (operationPage != null && operationPage != "") { diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index b0b0305..7ac35c6 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -35,17 +35,17 @@ 首页 - + 行情 - + 评估 - + 我的 @@ -72,8 +72,6 @@ localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); } - //document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index'); - //document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index'); //mui初始化 mui.init(); var subpages = ['yfindex.html', 'views/house/houseDetail.html', 'views/house/houseManageList.html', 'views/user/userInfo.html']; @@ -217,6 +215,43 @@ } }) } + + + // 推送消息跳转页面 + window.addEventListener('switchView',function(event){ + console.log(event.detail.name) + plus.webview.show(plus.webview.getWebviewById("HBuilder")); + var targetTab = event.detail.name; + if (targetTab == activeTab) { + return; + } + //若为iOS平台或非首次显示,则直接显示 + 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动画,且保存变量 + var temp = {}; + temp[targetTab] = "true"; + mui.extend(aniShow,temp); + plus.webview.show(targetTab,"fade-in",300); + } + //隐藏当前; + plus.webview.hide(activeTab); + //更改当前活跃的选项卡 + activeTab = targetTab; + var defaultTab = document.getElementById(targetTab); + //模拟首页点击 + mui.trigger(defaultTab, 'tap'); + //切换选项卡高亮 + var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active"); + if (defaultTab !== current) { + current.classList.remove('mui-active'); + defaultTab.classList.add('mui-active'); + } + }); 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/start.html b/fangija-zsyf/start.html index 138c66d..125e965 100644 --- a/fangija-zsyf/start.html +++ b/fangija-zsyf/start.html @@ -148,7 +148,11 @@ function run(){ } return false; } - time.innerHTML = time.innerHTML * 1 - 1; + var ntime = time.innerHTML * 1 - 1; + if(ntime <= 0) { + ntime = 0; + } + time.innerHTML = ntime; } diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index ae37d41..fd8660c 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -29,7 +29,7 @@ -

评估报告

@@ -151,11 +151,11 @@ $.config = {router: false} var sharehrefDes = "小区详情介绍!"; var shareId=''; var picUrl = '../../img/default_share.png'; - + var hid = ""; document.addEventListener('plusready', onPlusReady, false); function onPlusReady(){ var self = plus.webview.currentWebview(); - var hid = self.hid; + hid = self.hid; var houseStatus = "" shareUrl = shareUrl+"hid="+hid; @@ -202,6 +202,13 @@ $.config = {router: false} }, methods:{ feedback:function(i,event){ + + var eventType = "priceFeedbackClick"; + var dataMap = {}; + dataMap["hid"]=hid + dataMap["reason"]=i + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + if($(event.target).hasClass("theme")){ return; } @@ -352,6 +359,12 @@ $.config = {router: false} //添加管理AJAX请求 function addManagement(id, houseStatus, liveStatus){ + var eventType = "addManageClick"; + var dataMap = {}; + dataMap["hid"]=id; + dataMap["liveStatus"]=liveStatus; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + axios.post(BASE_PATH + "/rest/evaluate/addManagement", { id: id, @@ -542,6 +555,17 @@ function openaddWindow(){ clicked('/views/house/add.html',true,false,{},{type:1},function(){ }) } + +function share(){ + var eventType = "shareEvaluateClick"; + var dataMap = {}; + dataMap["hid"]=hid; + dataMap["type"]="evaluate"; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + + shareHref(); +} + diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 2af97b5..e828b8d 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -195,7 +195,7 @@
-

+

@@ -1891,6 +1891,9 @@ function addEvaluation(){ area:$("#input_area").val(), houseStatus:1} } + var eventType = "evaluateSubmitClick"; + saveBehaviorLog(eventType,data); //保存用户点击事件 + axios.get("/rest/index/checkEvalPrice", { params: data }) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 311a16c..f625d72 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -34,7 +34,7 @@ -

房产行情

@@ -1502,15 +1502,24 @@ $("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){ $("#tabCityDiv a").removeClass("active"); $("#contentTabDiv > .tab").removeClass("active"); $("#cityInfo").hide() + + var eventType = "changeHotCityClick"; + var dataMap = {}; + dataMap["city"]=$(this).text(); + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 }) function clickCity(val){ + var eventType = "changeHotCityClick"; + var dataMap = {}; + dataMap["city"]=val; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + shareUrl = BASE_PATH+"/house/cityShare?city="+val; $("#shareButton").show(); city = val; - plus.nativeUI.showWaiting(); $("#cityInfo").show() $("#tabCityDiv a").removeClass("active"); @@ -1532,7 +1541,7 @@ function clickCity(val){ $("#trendDiv a").removeClass("active") $("#trendDiv a[v='2']").addClass("active")// 默认走势显示半年 - + $("#tabQuotation1").removeClass("active"); $("#tabQuotation0").removeClass("active"); plus.nativeUI.closeWaiting(); @@ -1610,6 +1619,11 @@ function addFocus(city){ } }) }else{ + var eventType = "addHotCityClick"; + var dataMap = {}; + dataMap["city"]=city; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){ if(response.data.status){ reloadMyFocus() @@ -1636,11 +1650,21 @@ function addFocus(city){ } function hotCity(city){ + + clicked('../house/cityDetail.html',true,false,{},{city:city},function(){ }); } - +function share(){ + var eventType = "shareHotCityClick"; + var dataMap = {}; + dataMap["city"]=$("#tabCityDiv .active").text(); + dataMap["type"]="hotCity"; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + + shareHref(); +} diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 54495dd..2716cbe 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -302,6 +302,10 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap //立即评估 function openaddWindow(){ + var eventType = "evaluateClick"; + var dataMap = {}; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + clicked('/views/house/add.html',true,false,{},{type:1},function(){ }) } diff --git a/fangija-zsyf/views/message/detail.html b/fangija-zsyf/views/message/detail.html index c119857..491ff09 100644 --- a/fangija-zsyf/views/message/detail.html +++ b/fangija-zsyf/views/message/detail.html @@ -3,7 +3,7 @@ - +消息详情 diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 530d0d3..c045554 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -16,6 +16,13 @@ diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index b332a83..56f9594 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -54,7 +54,7 @@

立即登录

-
+