Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2

This commit is contained in:
bayi
2018-05-21 15:53:59 +08:00
5 changed files with 81 additions and 32 deletions
+5 -5
View File
@@ -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;}
+56 -9
View File
@@ -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<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 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<parray.length;i++){
var subArray = parray[i].split('=')
if(parray[i] != ""){
if(subArray.length > 0) {
jsonData[subArray[0]] = subArray[1];
}
}
}
clicked(openUrl,true,false,{},jsonData)
});
}
}
}, false);
}, false);
function openUrl(url){
clicked(url,true);
}
+2
View File
@@ -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: '小区下跌',
+5 -5
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>区域均价排行</title>
<title>区域均价排名</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
@@ -26,7 +26,7 @@
<button class="button button-link button-nav pull-right" onclick="share()">
<span class="icon icon-share"></span>
</button>
<h1 class="title">区域均价排行</h1>
<h1 class="title">区域均价排名</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="card cardPrice cardCity cardCity02">
@@ -109,8 +109,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script>
var shareUrl = BASE_PATH+"/house/regionRankShare?";
var sharehrefTitle = "城市均价排名";
var sharehrefDes = "城市均价排名介绍!";
var sharehrefTitle = "区域均价排名";
var sharehrefDes = "区域均价排名!";
var shareId='';
var picUrl = '_www/images/default_share.png';
@@ -155,7 +155,7 @@ $.config = {router: false}
}
regionsRankVue.$data.region = msg[0].region;
regionsRankVue.$data.avgPrice = msg[0].avgPrice;
regionsRankVue.$data.oneMonthUpDownRange = msg[0].oneMonthUpDownRange;
regionsRankVue.$data.oneMonthUpDownRange = msg[0].oneMonthUpDownRange == "" ? "暂无" : msg[0].oneMonthUpDownRange;
regionsRankVue.$data.regionInfos = msg;
}else{
//控制显示无数据效果
+13 -13
View File
@@ -51,7 +51,7 @@
<!--<div class="pull-to-refresh-arrow"></div>-->
</div>
<div class="card cardPrice" id="baseInfo" v-cloak onclick="openRegionRank()">
<div class="card cardPrice" id="baseInfo" v-cloak>
<div class="card-header">
<span>{{topMonth}}月份均价</span>
<span>
@@ -77,7 +77,7 @@
<span>
<em id="regionRankId_noData">暂无数据
</em>
<em id="regionRankId"><strong>{{regionRank}}</strong></em>
<em id="regionRankId" onclick="openRegionRank()"><strong>{{regionRank}}</strong></em>
<label>区域均价排名</label>
</span>
<span>
@@ -118,7 +118,7 @@
<div class="content-block-title cardNearbyName" id="nearAddress"><i class="icon icon-address02"></i><span id="nearDistrictSpan"></span><i class="icon arrow-up"></i></div>
<div class="cardNearbyBox" id="nearDistricts">
</div>
<div class="content-block-title recommend dn" id="todayNews">今日推荐</div>
<div class="content-block-title recommend" id="todayNews">热门推荐</div>
<div id="newsList">
</div>
@@ -1236,7 +1236,7 @@ var lat = 0;
var lng = 0;
var address = "";
var cat;
var todayDeployFlag = true;
//var todayDeployFlag = true;
var timestamp1 = new Date().getTime();
document.addEventListener('plusready', onPlusReady, false);
//扩展API加载完毕,现在可以正常调用扩展API
@@ -1607,16 +1607,16 @@ function initNews(page){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
}
if(page==1){
todayDeployFlag = true;
if(page==1 && response.data.data.list.length==0){
//todayDeployFlag = true;
$("#todayNews").hide();
}
for(var i in response.data.data.list){
dataObj.push(response.data.data.list[i])
if(dataObj[i].todayDeploy && todayDeployFlag){
/*if(dataObj[i].todayDeploy && todayDeployFlag){
todayDeployFlag = false;
$("#todayNews").show();
}
}*/
}
lastIndex = $('.cardInfo').length;
itemsPerLoad = response.data.data.list.length;
@@ -1833,7 +1833,7 @@ var itemsPerLoad2 = 5;
var dataObj = [];
var dataObj2 = [];
var page = 1;
var yesterDayDeployFlag = true;
//var yesterDayDeployFlag = true;
function addItems(number, lastIndex) {
// 生成新条目的HTML
@@ -1847,16 +1847,16 @@ function addItems(number, lastIndex) {
return;
}
var html = '';
if(lastIndex == 0){
/*if(lastIndex == 0){
yesterDayDeployFlag = true;
}
}*/
for(var i in dataObj){
if(i>=lastIndex){
if((dataObj.length<lastIndex + number) || (i < lastIndex + number)){
if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
/*if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
yesterDayDeployFlag = false;
html += '<div class="content-block-title recommend" style="border-top:solid 0.5rem #f3f3f3;">历史推荐</div>';
}
}*/
if(dataObj[i].type=="专题"){
html += '<div class="card cardInfo cardInfo01" onclick="openNewsView(\''+dataObj[i].id+'\',\''+dataObj[i].type+'\')">'+
'<div class="card-header">'+dataObj[i].title+'</div>'+