diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index d11b482..d757869 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -617,12 +617,12 @@ input::-webkit-input-placeholder{ .top.bar ~ .content{top:66px;} .top .icon{color:#b4b4b4;padding:0;} .top .searchBox{background:#EFEFEF;border-radius:0.25rem;padding:0.3rem 0;position:relative;} -.top .searchBox .cityChoice{width:24%;margin-left:0.5rem;border-right:solid 1px #e0e0e0;position:absolute;left:0;top:0.3rem;z-index:100;} -.top .searchBox .cityChoice a{color:#333;display:inline-block;vertical-align:middle;max-width:70px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +.top .searchBox .cityChoice{width:24%;height:26px;margin-left:0.5rem;border-right:solid 1px #e0e0e0;position:absolute;left:0;z-index:100;} +.top .searchBox .cityChoice a{color:#333;line-height:20px;display:inline-block;vertical-align:middle;max-width:70px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .top .searchBox .cityChoice i{font-size:0.5rem;right:-0.3rem;} -.top .searchBox span{width:100%;display:block;position:relative;} +.top .searchBox span{width:100%;height:26px;display:block;position:relative;} .top .searchBox span i{font-size:0.9rem;left:34%;padding-left:0.2rem;} -.top .searchBox span input{width:90%;background:none;border:none;padding-left:35%;display:inline-block;vertical-align:middle;} +.top .searchBox span input{width:90%;background:none;border:none;padding-left:35%;display:inline-block;vertical-align:middle;line-height:20px;} .top01{background:#fff;border-bottom:solid 1px #e7e7e7;padding:0 0.5rem;} .top01 .searchBox{background:none;} @@ -648,7 +648,7 @@ input::-webkit-input-placeholder{ .popup .bar .searchbar .searchbar-cancel{line-height:36px;} .popup .bar .searchbar .col-5{margin-left:1.5%;margin-right:2.5%;} .popup .bar .searchbar .icon-left{padding:0;line-height:38px;color:#666;} -.popup .bar .searchbar .search-input input{height:36px;border:solid 1px #e6e6ea;} +.popup .bar .searchbar .search-input input{height:36px;line-height:36px;border:solid 1px #e6e6ea;} .bar.bar-nav01{height:auto;overflow:hidden;padding-left:0.5rem;padding-right:0.5rem;} .bar.bar-nav01 .title{margin-left:-0.5rem;} .bar.bar-nav01 .button-link{color:#F18D00;} diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index f56b582..f5a5c82 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -1,3 +1,8 @@ + String.prototype.startWith=function(str){ + var reg=new RegExp("^"+str); + return reg.test(this); +} + /** * 推送处理业务逻辑 * yinjihuan @@ -71,9 +76,32 @@ document.addEventListener("plusready", function() { } }); } else if (payload.type == "2") { - plus.ui.alert(content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + if (payload.url.startWith("http")) { + plus.ui.alert(content,function(){ + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + }); + } else { + // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 + // 否则就是打开app内部页面 + plus.ui.alert(content,function(){ + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; + } + } + } + clicked(openUrl,true,false,{},jsonData) + }); + } + } } @@ -116,13 +144,32 @@ document.addEventListener("plusready", function() { } }); } else if (payload.type == "2") { - plus.ui.alert(title+"\n"+content,function(){ - openUrl(BASE_PATH+'/message/openView?url='+payload.url); - }); + if (payload.url.startWith("http")) { + plus.ui.alert(content,function(){ + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + }); + } else { + // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 + // 否则就是打开app内部页面 + plus.ui.alert(content,function(){ + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; + } + } + } + clicked(openUrl,true,false,{},jsonData) + }); + } } }, false); }, false); -function openUrl(url){ - clicked(url,true); -} \ No newline at end of file diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index d0de800..6a13d20 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -477,6 +477,7 @@ function addUpChart(dataUp, num){ } }, color: ['#EB5F34', '#e7e7e7'], + animation:false, series: [ { name: '小区上涨', @@ -522,6 +523,7 @@ function addDownChart(dataDown){ } }, color: ['#88D053', '#e7e7e7'], + animation:false, series: [ { name: '小区下跌', diff --git a/fangija-zsyf/views/city/regionRanking.html b/fangija-zsyf/views/city/regionRanking.html index 0e44e81..32dad14 100644 --- a/fangija-zsyf/views/city/regionRanking.html +++ b/fangija-zsyf/views/city/regionRanking.html @@ -3,7 +3,7 @@ -区域均价排行 +区域均价排名 @@ -26,7 +26,7 @@ -

区域均价排行

+

区域均价排名

@@ -109,8 +109,8 @@ $.config = {router: false}