diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js
index 369d1c2..7d545f7 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.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/css/main.css b/fangija-zsyf/css/main.css
index ef226ce..fcab50b 100644
--- a/fangija-zsyf/css/main.css
+++ b/fangija-zsyf/css/main.css
@@ -1429,9 +1429,11 @@ input[type=range]::-webkit-slider-thumb {
}
@media only screen and (-webkit-min-device-pixel-ratio:2){
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
+ .buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
}
@media only screen and (-webkit-min-device-pixel-ratio:3){
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
+ .buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
}
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/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');
+ }
+ });